update po files

31 files changed, 84210 insertions, 69842 deletions

diff --git a/po/be.po b/po/be.po
index 32c05edaf..79e4e327c 100644
--- a/po/be.po
+++ b/po/be.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -17,63 +17,11 @@ 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/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Jabber-праграма для GTK+"
-
-#: ../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-праграма"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
-msgid "Join _Group Chat..."
-msgstr "Удзельнічаць у _групавой размове"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Дадаць чалавека..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Пошук сервісаў"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Выканаць загад..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Змяніць рахунак"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Адкрыць уваходную пошту Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Асабістыя звесткі"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Пачаць размову"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Стан"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -84,83 +32,90 @@ msgstr ""
 "\n"
 "Калі ласка, пачакайце..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Выберыце адну з наступных опцый:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Запоўніце звесткі Вашага рахунка</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Аўтарызацыя"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Злучыцца па націску кнопкі \"Скончыць\""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Стварэнне рахунка"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Я ўжо маю патрэбны рахунак"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "_Зарэгістраваць новы рахунак"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Кіраванне..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ніякі"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Проксі:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Захоўваць па_роль"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Абнавіць профіль па злучэнні"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Адмысловы вузел / порт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -168,149 +123,145 @@ msgstr ""
 "Трэба зарэгістраваць рахунак, каб далучыцца да\n"
 "сеткі Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Адмысловыя"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Скончыць"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Назва вузла: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Рознае</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Асабістыя звесткі</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Уласцівасці</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+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/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Змяненне рахунка"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Рахункі"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Спіс адміністратараў"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Аўтарызацыя"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Аўтаматычна перадалучацца, калі знікае злучэнне"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Злучацца па старце Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "З_мяніць пароль"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Скарыстайце гэтую опцыю, калі хочаце, каб Gajim злучаўся з серверам праз "
-"порт 5223, праз які старыя серверы даюць мажлівасць выкарыстання SSL. "
-"Зважайце, што Gajim звычайна выкарыстоўвае шыфраванне TLS, калі звяртаецца "
-"да сервера, а гэтая опцыя адключыць выкарыстанне TLS"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Выберыце _ключ..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Пстрыкніце, каб змяніць пароль рахунка"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "_Злучацца па старце Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Злучэнне"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Змяніць асабістыя звесткі..."
+#: ../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 "Імя:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Агульная"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Назва вузла: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -318,8 +269,12 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim зойме некаторыя іншыя адрасы IP, і шанец "
 "правільнай перадачы файлаў падвысіцца."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
+
+#: ../data/gui/accounts_window.ui.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -327,16 +282,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim адпраўляе адмысловыя інфармацыйныя пакункі "
 "для запэўнівання сервера ў Вашым існаванні"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Калі гэтая опцыя ўключаная, Gajim будзе захоўваць пароль у файле ~/.gajim/"
-"config з правамі чытання толькі для Вас"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -344,8 +290,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim будзе аўтаматычна злучацца з дапамогай "
 "гэтага рахунка"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -354,47 +299,48 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, любыя глабальныя змены стану (праз адмысловы "
 "спіс унізе галоўнага вакна) будуць змяняць стан рахунка адпаведным чынам"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"Калі порт адпраўкі паведамленняў не прыдатны для Вас, выберыце іншы.\n"
+"Вам можа спатрэбіцца таксама змяніць настаўленні фаервола."
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Звесткі аб Вас, якія захоўваюцца на серверы"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Прозвішча:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Аб'яднаць рахункі"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Ключ не выбраны"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Ніякі"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Порт: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Прыяры_тэт:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -404,22 +350,20 @@ msgstr ""
 "злучаныя з серверам праз адзін рахунак. Праграма з найвышэйшым прыярытэтам "
 "атрымлівае гэтыя падзеі"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Прыярытэт будзе змяняцца згодна з станам."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Проксі:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "_Змяніць імя"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Рэ_сурс:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -432,211 +376,99 @@ msgstr ""
 "адзін рахунак і з рэсурса 'Дома', і з рэсурса 'Праца'. Падзеі будуць "
 "накіроўвацца на рэсурс з найвышэйшым прыярытэтам. (гл. ніжэй)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Захоўваць _пароль (небяспечна)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Захоўваць _журналы размоў з усімі людзьмі"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Адпраўляць праверачныя пакункі серверу"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "С_інхранізаваць стан рахунка з глабальным станам"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Паказаць _адлучаных людзей"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Ужыць _SSL (састарэлая опцыя)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Ужыць проксі для перадачы файлаў"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Адпаведна стану"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Імя:"
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Уласцівасці</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "_Адпаведна стану"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Рахункі"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Аўтарызацыя"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "_Злучацца па старце Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Імя:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Калі гэтая опцыя ўключаная, Gajim запомніць пароль для гэтага рахунка"
-
-#: ../data/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Калі порт адпраўкі паведамленняў не прыдатны для Вас, выберыце іншы.\n"
-"Вам можа спатрэбіцца таксама змяніць настаўленні фаервола."
-
-#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Прозвішча:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Аб'яднаць рахункі"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "_Змяніць імя"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Адпраўляць праверачныя пакункі серверу"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "С_інхранізаваць стан рахунка з глабальным станам"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Паказаць _адлучаных людзей"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Адмысловы вузел / порт"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Адмысловы порт:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Ужыць проксі для перадачы файлаў"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Змяніць асабістыя звесткі..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Уключыць"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Назва вузла: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Кіраванне..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Порт:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "Р_ахунак:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/gui/add_new_contact_window.ui.h:2
 msgid "A_llow this contact to view my status"
 msgstr "_Дазволіць чалавеку бачыць змены майго стану"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Дадаць новага чалавека"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -648,7 +480,7 @@ msgstr ""
 "гэтага пратакола. Пстрыкніце па кнопцы\n"
 "рэгістрацыі."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -656,621 +488,675 @@ msgstr ""
 "Вы павінны злучыцца з транспартам, каб\n"
 "дадаць людзей з гэтага пратакола."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Група:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Мянушка:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Пратакол:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Рэгістрацыя"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Адбылася памылка:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Выберыце загад для выканання:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Свае загады - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Праверыць яшчэ"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Апісанне памылкі..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Калі ласка, пачакайце канца атрымання спіса загадаў..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Калі ласка, пачакайце канца адпраўлення загаду..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Калі ласка, пачакайце..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Гэты рахунак не мае адпаведных загадаў."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Апісанне</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Адмысловы рэдактар настаўленняў"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Фільтар:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Выдаліць MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Выдаліць паведамленне дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Спісы прыватнасці"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Адправіць паведамленне ўсім далучаным людзям з гэтага сервера"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Вызначыць MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Вызначыць паведамленне дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Паказаць _кансоль XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Абнавіць MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Абнавіць паведамленне дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Адміністратар"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "Ад_правіць паведамленне серверу"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr " вакно / картка размовы з гэтым чалавекам адкрыта  "
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Дзеянні</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Умовы</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Гукі</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Адмысловыя дзеянні"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Адмысловыя настаўленні нагадванняў"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Усе станы"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Сышоў"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Заняты"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Нябачны"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Выканаць загад"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Мяне няма"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Некалькі спецыяльных станаў..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "У сетцы / Вольны для размовы"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Граць гук"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Атрыманае паведамленне\n"
-"Чалавек адлучыўся \n"
-"Чалавек змяніў стан \n"
-"Фарбаванае паведамленне групавой размовы \n"
-"Атрыманае групавое паведамленне \n"
-"Запыт на перадачу файла \n"
-"Перадача файла пачалася \n"
-"Перадача файла скончаная"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 "_Скарыстаць здольнасць UrgencyHint, каб вакно размовы міргала на панэлі "
 "заданняў"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Не адкрываць аўтаматычна вокны размовы"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Адключыць выплыўнае вакно"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Адключыць гук для гэтай падзеі"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Не паказваць падзею ў галоўным вакне"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Не паказваць падзею ў прасторы паведамленняў"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Паведаміць у выплыўным вакне"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Адкрыць вакно размовы з карыстальнікам"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Паказваць падзею ў галоўным вакне"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Паказваць падзею ў прасторы паведамленняў"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "і я "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "Людзі"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
-"людзі\n"
-"групы\n"
-"усе"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "для "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Уваход:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Назва крыніцы:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Апошняя змена:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Атрыманае новае паведамленне"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Вы атрымалі новае паведамленне:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "Людзі"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Паведамленні аб змене стану</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Паведамленні аб змене стану</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Гукі</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Змяніць пароль"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Увядзіце для пацверджання:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Увядзіце новы пароль:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Увядзіце тэкст новага паведамлення аб змене стану</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Актывізаваны"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Пакой:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Стандартныя паведамленні:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Захаваць тлумачэнне..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Удзельнічаць у _групавой размове"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "№"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Дадаць у кантактны ліст"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Скапіяваць JID / паштовы адрас"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Скапіяваць адрас спасылкі"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Напісаць ліст"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Адкрыць у праглядальніку"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Пачаць размову"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "Ад_правіць"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "За_прасіць"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "Назіральнікі"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "Спытацца _дазволу праглядаць змены стану"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "Дадаць спецыяльнае _нагадванне"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "Прызначыць ключ Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Выканаць загад..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Змяніць _групы"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "За_прасіць"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Людзі"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "Вы_даліць"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Адправіць асаблівы XML"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Адправіць _асобнае паведамленне..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "Адправіць _файл"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Пачаць _размову"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Пераключыць шыфраванне Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Пераключыць шыфраванне Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Дадаць у кантактны ліст"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "Дазволіць чалавеку _бачыць змены майго стану"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Забараніць праглядаць змены майго стану"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Журнал"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "Змяніць імя чалавека"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "Змяніць _імя"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "П_адпіска"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "дзевяць"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Запоўніце форму."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Настаўленні пакоя"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Змяніць групы"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Апісанне</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Здольнасці сервера"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Скасаваць перадачу файла"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Скасаваць выбраную перадачу файла"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../data/gui/filetransfers.ui.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Скасаваць выбраную перадачу файла і выдаліць няскончаны файл"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Па_чысціць"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Перадача файлаў"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Схаваць вакно"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Выдаліць перадачу файла з спіса."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Выдаліць скончаныя, скасаваныя і хібныя запісы перадачы файлаў з спіса"
 
-#: ../data/glade/filetransfers.glade.h:10
+#: ../data/gui/filetransfers.ui.h:10
 msgid "Shows a list of file transfers between you and others"
 msgstr "Паказаць спіс перадаваных і атрыманых файлаў"
 
-#: ../data/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1278,75 +1164,74 @@ msgstr ""
 "Выдаліць адзін файл з чаргі перадачы. Калі яшчэ адбываецца перадача, яна "
 "спыняецца, а потым выдаляецца"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Паказаць нагадванне па сканчэнні перадачы файла"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Працягнуць"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Паведамляць мне аб сканчэнні перадачы файлаў"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Адкрыць дырэкторыю з файлам"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Прыпыніць"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "спіс файлаў у чарзе на перадачу"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Колер картак</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Шэраг рахункаў\n"
-"Шэраг групаў\n"
-"Шэраг людзей\n"
-"Банер размовы"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Рахунак"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Тлусты"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Піша"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Чалавек"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Шрыфт:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Настаўленне тэмы Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Знік"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Група"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Неактыўны"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Нахілены"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1354,7 +1239,7 @@ msgstr ""
 "MUC\n"
 "Паведамленні"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1362,115 +1247,74 @@ msgstr ""
 "Накіраваны MUC\n"
 "Паведамленні"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Прыпынена"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Колер _тэксту:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Шрыфт:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Фон:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "Змяніць м_янушку"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "Змяніць _тэму"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "Настаўленні _пакоя"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Змясціць у закладках"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Кіраванне закладкамі"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Ма_дэратар"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Дзеянні ўдзельнікаў"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Адправіць _файл"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Дадаць у кантактны ліст"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Адміністратар"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Забараніць казанне"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Выкінуць"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Удзельнік"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Уладальнік"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "Ад_правіць прыватнае паведамленне"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Голас"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Стварыць новы допіс"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Ад"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Тэма"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1486,26 +1330,20 @@ msgstr ""
 "Калі Вы хочаце здзейсніць масавую чыстку журналаў, закрыйце Gajim. Не "
 "выдаляйце журналы размоў з людзьмі, з якімі Вы зараз размаўляеце."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Выдаліць"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Экспартаваць"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim - Кіраўнік журналаў размоў"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1514,427 +1352,442 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Пошук у базе дадзеных"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Імя чалавека"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Групавыя размовы"
+
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Пошук"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Весці журнал размоў"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "_Змясціць у закладках"
+msgid "Bro_wse Rooms"
+msgstr "_Праглядзець"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Удзельнічаць у групавой размове"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:4
+#, fuzzy
+msgid "Join this room _automatically when I connect"
 msgstr "Увайсці ў гэты пакой па злучэнні"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Мянушка:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Нядаўна:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Пакой:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Змясціць у закладках"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Далучыцца"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Кіраванне рахункамі"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Аўтаматычна далучацца"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Кіраванне закладкамі"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Стан друку:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Сервер:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Загаловак:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Настаўленні пакоя"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Працягнуць"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "Выдаліць"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Уласцівасці</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Настаўленні</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr "Злучэнне HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Кіраванне профілямі проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Па_роль:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Проксі:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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 "С_карыстаць проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Аўтарызацыя"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "_Спасылка:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Імя:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Тып:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Імя карыстальніка:"
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Дадаць чалавека ў спіс"
-
-#: ../data/glade/message_window.glade.h:2
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Змясціць у закладках"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Змяніць м_янушку"
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "сочыць за размовай"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "Ад_правіць"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Пароль"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Адмысловы рэдактар настаўленняў</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Праграмы</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Дзеянні</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Дзеянні</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Змяніць правіла</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Колер картак</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Візуальныя нагадванні</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Умовы</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Гукі</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Настаўленні GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Паведамленні аб змене стану</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<i>Спіс прыватнасці</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Паведамленні аб змене стану</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Уласцівасці</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Дадаць правіла</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Візуальныя нагадванні</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Адмысловы"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Адмысловы"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Усе станы\n"
-"Толькі пісанне\n"
-"Адключана"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Усе станы"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Дазволіць адпраўку звестак аб _сістэме"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Дазволіць адпраўку звестак аб _сістэме"
+
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Дазволіць паказ паведамленняў і нагадванні, калі я _сышоў/заняты/нябачны"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Сышоў"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Запытацца аб паведамленні змены стану, калі я:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
 msgstr ""
-"Аўтаматычна вызначаць пры кожным запуску Gajim\n"
-"Заўсёды карыстацца праграмамі, прызначанымі ў GNOME\n"
-"Заўсёды карыстацца праграмамі, прызначанымі ў KDE\n"
-"Адмысловы"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "_Злучацца па старце Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "П_аведамленне стану:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim _прадвызначанай Jabber-"
 "праграмай"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Піша"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Настаўленні колераў і шрыфтаў"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "П_аведамленне стану:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Імя чалавека"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Адмысловы</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Адключана"
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Паказаць _падрабязнасці пошты"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Паказваць _малюнкі ў галоўным вакне"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Паказваць _малюнкі ў галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Паказваць _стан у галоўным вакне"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1943,7 +1796,7 @@ msgstr ""
 "Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
 "Вызначце, аб якіх зменах стану Вы хочаце ведаць."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1952,7 +1805,7 @@ msgstr ""
 "Gajim можа адпраўляць і атрымліваць метазвесткі размоў з пэўным чалавекам. "
 "Вызначце, аб якіх зменах стану Вы хочаце паведамляць суразмоўцу."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1960,12 +1813,12 @@ msgstr ""
 "Gajim будзе паведамляць Вам аб сышоўшых людзях у выплыўным вакне ў правым "
 "верхнім куце экрана"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Схаваць кнопкі групавой размовы."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1974,7 +1827,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim далучыцца да гэтай групавой размовы пры "
 "запуску"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1982,18 +1835,18 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
 "новых лістоў"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2001,7 +1854,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -2009,7 +1862,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае паведамленні аб зменах стану для "
 "кожнага чалавека ў галоўным вакне і ў групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2017,7 +1870,15 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
+"групавых размовах"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2025,7 +1886,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2033,14 +1894,14 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim паказвае аватары ў галоўным вакне і ў "
 "групавых размовах"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2052,14 +1913,14 @@ msgstr ""
 "зважайце, што ў такім разе ніхто з людзей, якіх няма ў Вашым спісе, не зможа "
 "адправіць Вам паведамленне"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2068,7 +1929,7 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim таксама дадасць звесткі аб адпраўніку "
 "новых лістоў"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2078,13 +1939,13 @@ msgstr ""
 "пратаколаў. (напр., чалавек з MSN будзе мець адпаведныя значкі злучанасці, "
 "адсутнасці, занятасці і г.д. для MSN-карыстальнікаў)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2092,79 +1953,104 @@ msgstr ""
 "Калі гэтая опцыя ўключаная, Gajim заменіць ascii-сымболікі (напр., ':)' ) "
 "адпаведнай значкай"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Вакно для аднаго паведамлення:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Кі_раванне..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Ніколі"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Змяненне рахунка"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Паведамляць мне аб людзях, якія: "
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Паведамляць мне пра гэта"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Паведамляць аб новай пошце на _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Граць _гук"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Вынырваць"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Уласцівасці"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Сервер:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Паказваць толькі ў _галоўным вакне"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Паказваць падзею ў прасторы паведамленняў"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Злучыцца"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "З_ысці"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2172,30 +2058,30 @@ msgstr ""
 "Некаторыя паведамленні ўключаюць афармленне (фармат, колеры і г.д.). Калі "
 "гэтая опцыя ўключаная, Gajim будзе паказваць нефарматаваны тэкст."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Упарадкаваць людзей па стане"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Стан"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Прадвызначаны набор _значак стану:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "Марнаванне часу"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "Т_эма:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2203,7 +2089,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2211,787 +2097,763 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Ужыць _значкі транспартаў"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Ужыць _сістэмны"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Па атрыманні новай падзеі"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Памылка: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "П_ерад мянушкай:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "Аўтаматычна змяняць стан на \"_сышоў\" праз:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Гартач:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "_Паказваць нагадванні стану размовы:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Сымболікі:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Кіраўнік файлаў:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Фарбаваць няправільна напісаныя словы"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ігнараваць падзеі ад людзей, якіх няма ў кантактным лісце"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ігнараваць афармленне ўваходных паведамленняў"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Пісаць у журнал паведамленні аб змене стану чалавека"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Паштовая праграма:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Аўтаматычна змяняць стан на \"_недаступны\" праз:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Адкрыць..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Вярнуць звычайныя колеры"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "_Паказваць нагадванні стану размовы:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "П_аведамленне стану:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "Удзельнічаць у _групавой размове"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "Няма ў спісе"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "хвіліны"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Спісы прыватнасці:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Дадаць / Змяніць правіла</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Спіс правілаў</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Спіс прыватнасці</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Актыўны для гэтага сеанса"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Актываваць пры запуску"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Усе"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "усе па падпісцы"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Дазволіць"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Адмовіць"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Парадак:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Спіс прыватнасці"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "усе па падпісцы"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "усе з групы"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ніводны\n"
-"абодва\n"
-"ад\n"
-"каму"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Абодва"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Ад"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "адзін"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "два"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "адпраўляць мне паведамленні"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "адпраўляць мне запыты"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "адпраўляць мне паведамленні аб змене стану"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "бачыць мой стан"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
 msgid "<b>Address</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "Аватар:"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Birthday:</b>"
 msgstr "Народзіны:"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 #, fuzzy
 msgid "<b>Company:</b>"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Гукі</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Аддзел:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-mail:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Дадатковы адрас:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Прозвішча:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Адмысловы</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "У Сеціве:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Мянушка:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Тэлефонны нумар:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Умовы</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Паштовы індэкс:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Уласцівасці</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Гукі</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Настаўленні</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Настаўленні</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Гукі</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Пра мяне"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Пстрыкніце, каб вызначыць свой аватар"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "Фармат: ГГГГ-ММ-ДД"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Праца"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Што Вы хочаце зрабіць?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Выдаліць рахунак _толькі для Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Выдаліць рахунак для Gajim і на _серверы"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "Вы_даліць"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Добра"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Выдаліць"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Дадаць чалавека..."
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Здольнасці сервера"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Перадача _файлаў"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Частыя пытанні (у Сеціве)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Дапамога ў Сеціве"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Профіль, а_ватар"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Паказаць _адлучаных людзей"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Паказаць _транспарты"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Паказаць _адлучаных людзей"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Паказаць _галоўнае вакно"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Рахункі"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Дзеянні"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Змест"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Змяніць"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_Частыя пытанні"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Даведка"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Настаўленні"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Выйсці"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Адправіць _асобнае паведамленне..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Выгляд"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "Калі ласка, пачакайце канца атрымання спіса загадаў..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Пошук"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Дадаць _чалавека"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "П_ошук"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Ісці"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Адрас:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Зарэгістравацца"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Скасаваць"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Ад:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Адказаць на гэтае паведамленне"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Ад_правіць"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Адправіць паведамленне"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Адправіць паведамленне і закрыць вакно"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Тэма:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Каму:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Адказаць"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Ад_правіць і закрыць"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "А_ўтарызаваць"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../data/gui/subscription_request_window.ui.h:2
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Аўтарызаваць чалавека, каб ён мог бачыць, калі Вы далучаны"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Забраць аўтарызацыю ў чалавека, каб ён не мог бачыць, калі Вы далучаны"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Запыт падпіскі"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Адмовіць"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID чалавека, з якім Вы хочаце паразмаўляць"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Адключыць гукі"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Адправіць _асобнае паведамленне"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Паказаць нягледжаныя _падзеі"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Ст_ан"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Групавая размова"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Дзеянні</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Настаўленні</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Рэсурс:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Настаўленні</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Апісанне</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Адмысловы</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Каментарыі"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Настаўленні _пакоя"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Чалавек"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Асабістыя звесткі"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Яшчэ"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "Аватар:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Гукі</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Трафік Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Увод XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Звесткі/Запыт"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Паведамленне"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Прысутнасць"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Змяніць рахунак..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Мясцовы jid:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Асабістае"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Рэсурс:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Стан:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Jabber-праграма для GTK+"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Асабістыя звесткі"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3016,7 +2878,7 @@ msgstr "Цэлы лік"
 msgid "Text"
 msgstr "Тэкставае"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Колер"
 
@@ -3157,134 +3019,134 @@ msgstr "Шведская"
 msgid "Chinese (Ch)"
 msgstr "Кітайская (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Мова правапісу"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Няма злучэння"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr "Вы не можаце адпраўляць паведамленні без злучэння."
 
-#: ../src/chat_control.py:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "дзевяць"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Мянушка"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "_Шрыфт:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Асабістыя звесткі"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Шыфраванне дзейнічае"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Няма ў спісе"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Спіс актыўных, скончаных і спыненых перадачаў файлаў"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Аўтарызацыя"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Аўтарызацыя"
@@ -3292,58 +3154,58 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Гэтае паведамленне зашыфраванае]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вам адправіў паведамленне \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3351,127 +3213,137 @@ msgstr ""
 "Калі Вы закрыеце гэтую картку з адключаным вядзеннем журналаў, гэтае "
 "паведамленне згубіцца."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s цяпер %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "стварэнне базы журналаў"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "стварэнне базы журналаў"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s з'яўляецца файлам, але павінна быць дырэкторыя"
 
-#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim сканчвае работу"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s з'яўляецца дырэкторыяй, але павінны быць файл"
 
-#: ../src/common/check_paths.py:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "стварэнне дырэкторыі %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Змяніць звесткі аб стане"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Змяніць стан"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Выставіць тып прысутнасці і апісанне"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Вольны для размовы"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "У сетцы"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Пашыраны рэжым адсутнасці"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Не турбаваць"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Адлучаны - па-за сеткай"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Апісанне прысутнасці:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Стан змяніўся."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Сысці з групавых размоў"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s на %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr "Выберыце групавыя размовы, з якіх Вы хочаце сысці"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Групавыя размовы"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Вы сышлі з наступных групавых размоў:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d нечытанае паведамленне"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3568,9 +3440,9 @@ msgid ""
 msgstr "Спіс падзеленых прагаламі згорнутых рахункаў і групаў."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Прадвызначана"
@@ -3847,11 +3719,11 @@ msgid ""
 "contact under the contact name in roster window."
 msgstr "Калі true, Gajim паказвае стан у галоўным вакне для кожнага чалавека"
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3860,13 +3732,13 @@ msgstr ""
 "чалавеку, хто не меў усталяванага аватара ў апошні сеанс, ці чый аватар "
 "надта стары."
 
-#: ../src/common/config.py:230
+#: ../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."
 msgstr "Калі false, не паказваць паведамленні аб змене стану суразмоўцы."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3880,30 +3752,30 @@ msgstr ""
 "паказваць усе такія паведамленні. Калі опцыя выстаўленая ў \"in_and_out\", "
 "Gajim будзе паказваць толькі паведамленні аб сыходзе / ўваходзе суразмоўцы."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Фонавы колер для толькі ўвайшоўшых людзей."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Фонавы колер для толькі сышоўшых людзей."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Калі true, адноўленыя з папярэдняга сеанса паведамленні будуць мець меншы "
 "памер шрыфта."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Не паказваць аватар для транспарта."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Не паказваць галоўнае вакно на панэлі заданняў."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3913,7 +3785,7 @@ msgstr ""
 "вакном (звычайныя паводзіны ў бальшыні кіраўнікоў вокнаў) пры наяўнасці "
 "нягледжаных падзей."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3924,7 +3796,7 @@ msgstr ""
 "перастаць адпраўляць звесткі sha у групавыя размовы"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3944,32 +3816,32 @@ msgstr ""
 "адпраўляюцца ў асобныя вокны. Зважайце, што гэтыя змены будуць ужытыя толькі "
 "пасля перазапуску праграмы."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Калі true, клавіша Escape закрывае картку / вакно."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Схаваць кнопкі групавой размовы."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Хавае банер у групавой размове"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Хавае банер у прыватнай размове"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Схаваць спіс удзельнікаў групавой размовы."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3977,28 +3849,28 @@ msgstr ""
 "У групавой размове не паказваць мянушку, калі папярэдняе паведамленне "
 "напісаў той самы чалавек."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Водступ пры шматмэтавым прызначэнні паведамлення."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Адправіць паведамленне і закрыць вакно"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "Спіс колераў для фарбавання мянушак у групавой размове."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab пераходзіць у наступную картку, калі няма нечытаных паведамленняў."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4006,7 +3878,7 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4015,7 +3887,7 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4024,7 +3896,7 @@ msgstr ""
 "Ці трэба паказваць вакно пацверджання пры стварэнні мета-кантакта? Пусты "
 "радок адключае гэтае вакно."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -4034,7 +3906,7 @@ msgstr ""
 "Вы ўвайшлі з адмоўным прыярытэтам, Вы не будзеце атрымліваць паведамленняў "
 "ад Вашага сервера."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4042,7 +3914,7 @@ msgstr ""
 "Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
 "пароляў Gnome Keyring (калі ўсталяваны)."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4051,7 +3923,7 @@ msgstr ""
 "Калі true, Gajim будзе захоўваць паролі ад рахункаў з дапамогай кіраўніка "
 "пароляў Gnome Keyring (калі ўсталяваны)."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4059,7 +3931,7 @@ msgstr ""
 "Калі true, Gajim будзе паказваць у кантактным лісце колькасць падлучаных "
 "людзей і агульную колькасць у радках групаў і рахункаў."
 
-#: ../src/common/config.py:263
+#: ../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"
@@ -4067,67 +3939,83 @@ msgstr ""
 "Можа мець значэнні 'chat', 'normal' альбо быць пустым. Калі не пустое, то "
 "лічыць усе ўваходныя паведамленні гэтага тыпу"
 
-#: ../src/common/config.py:264
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4135,79 +4023,84 @@ msgstr ""
 "Аўтаматычна змяняць прыярытэт згодна з станам. Прыярытэты выстаўленыя ў "
 "опцыях autopriority_*."
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Калі false, не паказваць аватары ў вакне размовы."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Выпраўленне хібы Jabberd2"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4215,125 +4108,130 @@ msgstr ""
 "Калі выстаўленая гэтая опцыя, Gajim будзе ўжываць для перадачы файлаў "
 "выстаўленыя IP-адрас і проксі-серверы з параметра file_transfer_proxies."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ці ўжыты OpenPGP ў размове з гэтым чалавекам?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова праверкі правапісу"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "усе ці падзеленыя прагаламі станы"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ці 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ці ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сон"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Хутка буду"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Хутка буду."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Ежа"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Ямо, пакіньце мне паведамленне."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Фільм"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Гляджу фільм."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Працую"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Працую."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Тэлефон"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Я на тэлефоне."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Сышоў"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Я цешуся з жыцця."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Я даступны."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Я магу размаўляць."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Хутка прыйду."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Мяне няма."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Не турбаваць."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Бывай!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4342,106 +4240,98 @@ msgstr ""
 "вызначаных у параметры muc_highlight_words, ці калі гэтае паведамленне "
 "ўтрымлівае Вашую мянушку."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Прайграць гук пры атрыманні паведамлення MUC."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "зялёны"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "садавіна"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "чалавек"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "мора"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Немагчыма загрузіць модуль idle"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Няправільны вузел"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Звесткі рэгістрацыі для транспарта %s не прыйшлі ў час"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Зарэгістравацца на %s"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Няправільны Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Такая мянушка не дазволеная: %s"
@@ -4449,77 +4339,77 @@ msgstr "Такая мянушка не дазволеная: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Немагчыма ўвайсці ў групавую размову"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вам забаронена казанне ў гэтай групавой размове."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Такой групавой размовы няма."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Стварэнне групавых размоў абмежаванае."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Вы павінны карыстацца зарэгістраванай для Вас мянушкай."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас няма ў спісе ўдзельнікаў."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "цяпер падпісаны на %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запыт адпіскі ад %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "цяпер адпісаны ад %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4659,28 +4549,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/common/connection.py:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Гэтае паведамленне *зашыфраванае* (Гл.:JEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4689,108 +4579,108 @@ msgstr ""
 "Тэма: %s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Перадалучыцеся самастойна."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Няправільны адказ"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспарт %s некарэктна адказаў, каб зарэгістраваць запыт: %s"
 
-#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Праверце злучэнне, альбо паспрабуйце пазней."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Захаваць у: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Злучэнне для рахунка \"%s\" згубленае"
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Праверце злучэнне альбо паспрабуйце пазней"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Памылка аўтарызацыі з \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Праверце звесткі аўтарызацыі."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Памылка ў часе выдалення спіса прыватнасці"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4799,45 +4689,45 @@ msgstr ""
 "Спіс прыватнасці %s не выдалены. Магчыма, ён ужываецца ў адным з Вашых "
 "злучаных рэсурсаў. Дэактывізуйце іх і паўтарыце свае дзеянні."
 
-#: ../src/common/connection.py:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Людзі"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Не атрымана з-за нябачнага стану"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Памылка злучэння"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Назіральнікі"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Транспарты"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Няма ў спісе"
 
@@ -4846,37 +4736,53 @@ msgstr "Няма ў спісе"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Залежнасць ад pysqlite2 (aka python-pysqlite2) не выкананая. Выхад..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "D-Bus няма на гэтым кампутары, альбо няма адпаведнага модуля python"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "Назва рахунка не павінна быць пустой."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Сервіс недаступны: Gajim не працуе, альбо remote_control мае значэнне False"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus няма на гэтым кампутары, альбо няма адпаведнага модуля python"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Шына сеанса недаступная.\n"
+"Чытайце http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Шына сеанса недаступная.\n"
 "Чытайце http://trac.gajim.org/wiki/GajimDBus"
@@ -5044,206 +4950,206 @@ msgstr "Канец тыдня"
 msgid "Weekend!"
 msgstr "Выходныя!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Няправільны знак у імені карыстальніка."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Патрэбны адрас сервера."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Няправільны знак у назве вузла."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Няправільны знак у назве рэсурса."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Заняты"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Заняты"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "М_яне няма"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Магу размаўляць"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Магу размаўляць"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Тут"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Тут"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Злучэнне"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "Н_е тут"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Адключаны"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Адключаны"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Нябачны"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?чалавек у стане:Невядомы"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?чалавек у стане:Ёсць памылкі"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Ужо ёсць падпіскі:Няма"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Да"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Абодва"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Запыт (на падпіску):Няма"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Падпісацца"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Роля чалавека:Няма"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Мадэратары"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Мадэратар"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Удзельнікі"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Наведвальнікі"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Наведвальнік"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Адносіны ўдзельніка групавой размовы:Няма"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Уладальнік"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Адміністратар"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Удзельнік"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "сочыць за размовай"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "заняты чымсьці іншым"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 msgid "is composing a message..."
 msgstr "піша паведамленне..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "перастаў пісаць"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "закрыў вакно / картку размовы"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s кiБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5251,22 +5157,22 @@ msgstr[0] "Адправіць паведамленне"
 msgstr[1] "Адправіць паведамленне"
 msgstr[2] "Адправіць паведамленне"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5274,12 +5180,49 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Настаўленні пакоя"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5289,17 +5232,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Стандартныя паведамленні стану"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Памер: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "памылка: немагчыма прачытаць %s"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "перанос базы журналаў у індэкс"
 
@@ -6007,19 +6007,19 @@ msgstr ""
 msgid "Writing"
 msgstr "Працую"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6027,19 +6027,19 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:91
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Немагчыма адкрыць порт %s."
 
-#: ../src/common/socks5.py:87
+#: ../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:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6108,26 +6108,22 @@ msgstr "Немагчыма злучыцца з вузлом: скончыўся
 msgid "Error while adding service. %s"
 msgstr "Памылка дадання сервіса. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Адключана"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Стандартныя паведамленні стану"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Уключыць"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Слоўніка для мовы %s няма"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6136,215 +6132,215 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "загаловак паведамлення аб змене стану"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "тэкст паведамлення аб змене стану"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Перадалучыцца?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Калі Вы хочаце ўжыць усе зробленыя змены, перадалучыцеся."
 
-#: ../src/config.py:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Немагчыма ўжыць OpenPGP на гэтым кампутары"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Нягледжаныя падзеі"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Прагледзьце нягледжаныя падзеі перад выдаленнем гэтага рахунка."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Вы пачалі размову ў рахунку %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Усе размоўныя вокны закрыюцца. Хочаце працягнуць?"
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Вы злучаны з серверам"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Каб змяніць назву рахунка, Вы павінны праглядзець усе нягледжаныя падзеі."
 
-#: ../src/config.py:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Гэтая назва ўжо скарыстаная для іншага рахунка. Выберыце іншую назву."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Назва рахунка не павінна быць пустой."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Назва рахунка не павінна ўтрымліваць прагалаў."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "Кіраванне рахункамі"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID павінны мець форму \"user@servername\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Адмысловы порт павінны быць нумарам порта."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Немагчыма атрымаць сакрэтныя ключы"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Памылка пошуку Вашых сакрэтных ключоў OpenPGP."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Выбар ключоў OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Выберыце Ваш ключ OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Такога рахунка няма"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr "Вы павінны стварыць рахунак да рэдагавання асабістых звестак."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Немагчыма рэдагаваць асабістыя звесткі ў адлучаным рэжыме."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не падтрымлівае Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Сервер не можа захаваць Вашыя асабістыя звесткі."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Каб змяніць назву рахунка, трэба папярэдне адлучыцца."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Мясцовы рахунак Local ужо існуе."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Змяніце назву альбо выдаліце яго, каб скарыстаць мясцовыя паведамленні."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Змяніць %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Зарэгістравацца на %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Чорны спіс"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Спіс удзельнікаў"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Спіс уладальнікаў"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Спіс адміністратараў"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Прычына"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Мянушка"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Забараніць казанне..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6352,11 +6348,11 @@ msgstr ""
 "<b>Каму Вы хочаце забараніць казанне?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Дадаць ўдзельніка..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6364,11 +6360,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць удзельнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Дадаць уладальніка..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6376,11 +6372,11 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць уладальнікам?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Дадаць адміністратара..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6388,7 +6384,7 @@ msgstr ""
 "<b>Каго Вы хочаце зрабіць адміністратарам?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6405,89 +6401,117 @@ msgstr ""
 "4. domain (гэты домэн user@domain,\n"
 "domain/resource ці адрас паддамена)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Выдаленне рахунка %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Шыфраванне адключанае"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Патрабуецца пароль"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Увядзіце пароль для рахунка %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Захаваць пароль"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Калі Вы выдаліце яго, згубіцца злучэнне."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Памылка злучэння"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Што Вы хочаце зрабіць?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Выдаліць рахунак _толькі для Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Прадвызначана"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Усе"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Увайсці і выйсці"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Няма"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Гэтая закладка мае няправільныя звесткі"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Запоўніце палі сервера і пакоя альбо выдаліце гэтую закладку."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Такая мянушка не дазволеная: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Няправільны элемент"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Рахунак паспяхова дададзены"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6498,36 +6522,36 @@ msgstr ""
 "\"Адмысловыя\", альбо пазней, выбраўшы элемент \"Рахункі\" ў меню \"Змяніць"
 "\" галоўнага вакна."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Вы павінны пазначыць імя карыстальніка, каб змяніць настаўленні гэтага "
 "рахунка."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Вызначце сваю новую мянушку:"
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6537,7 +6561,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6545,61 +6569,61 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Адбылася памылка ў часе стварэння рахунка"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Назва рахунка ўжо скарыстаная"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Вы ўжо маеце рахунак з такой назваю."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Актыўны"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Падзея"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Атрыманае першае паведамленне"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Атрыманае наступнае паведамленне"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Чалавек далучыўся"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Паведамленне адпраўленае"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Фарбаванае паведамленне ў групавой размове"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Новае паведамленне ў групавой размове"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Новы ліст GMail"
 
@@ -6617,45 +6641,45 @@ msgid ""
 "last time you paid attention to this group chat"
 msgstr "Тэкст пад гэтай рысаю ёсць тэкстам, які Вы яшчэ не бачылі"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Выйсці"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дзеянні для \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Прачытаць артыкул у _Вікіпедыі"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Шукаць у _слоўніку"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адрасе пошуку ў Сеціве не хапае \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Шукаць у Сеціве"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Адкрыць _спасылку"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6664,7 +6688,7 @@ msgstr[1] "Учора"
 msgstr[2] "Учора"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тэма: %s\n"
@@ -6774,73 +6798,73 @@ msgstr ""
 "Запоўніце палі звесткамі пра чалавека, якога Вы хочаце дадаць у спіс рахунка "
 "%s"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Запоўніце палі звесткамі, каб дадаць чалавека ў спіс"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Няправільны ID карыстальніка"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "ID карыстальніка не павінны вызначаць рэсурс."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Чалавек ужо ёсць у кантактным лісце"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Гэты чалавек ужо ёсць у у кантактным лісце."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ID карыстальніка:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Jabber-праграма для GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Актыўныя распрацоўнікі:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Былыя распрацоўнікі:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "Падзякі:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6851,109 +6875,109 @@ msgstr ""
 "Вы павінны ўсталяваць слоўнік %s, каб спраўджваць правапіс, альбо выбраць "
 "іншую мову праз опцыю speller_language."
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запыт увагі на рахунак %s ад %s"
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запыт увагі ад %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы ўжо ўдзельнічаеце ў групавой размове %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Удзельнічаць у групавой размове праз рахунак %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Няправільная назва рахунка"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Няправільны Jabber ID групавой размовы"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID групавой размовы ўтрымлівае няправільныя знакі."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Гэта не групавая размова"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не з'яўляецца сапраўднай назвай групавой размовы."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Рахунак \"%s\" злучаны з серверам"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Вы не можаце ўдзельнічаць у групавой размове, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Пачаць размову з рахунка %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Пачаць размову"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6962,173 +6986,171 @@ msgstr ""
 "хочаце адправіць паведамленне:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Няма злучэння"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Праверце злучэнне з \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Няправільны JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Немагчыма разабраць \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Вы не можаце змяніць пароль, не злучыўшыся з серверам."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Няправільны пароль"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Вы павінны ўвесці пароль."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Паролі розняцца"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі ў абодвух палях павінны быць аднолькавымі."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Чалавек прыйшоў"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Чалавек сышоў"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Новае паведамленне"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Новае асобнае паведамленне"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Новае прыватнае паведамленне"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Новы ліст"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Памылка перадачы файла"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Перадача файла скончаная"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Перадача файла спыненая"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Запрашэнне ў групавую размову"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Чалавек змяніў стан"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Асобнае паведамленне для рахунка %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Асобнае паведамленне"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Адправіць %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Атрымана %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s сказаў:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Кансоль XML для %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Кансоль XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Марнаванне часу"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "_Змяніць"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "Вы_даліць"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7136,157 +7158,157 @@ msgid ""
 msgstr "Я хачу дадаць Вас у свой кантактны ліст."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 #, fuzzy
 msgid "Add"
 msgstr "Адрас"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "_Змяніць"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Выдаліць"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Я хачу дадаць Вас у мой кантактны ліст."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Дадаць _чалавека"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Спіс прыватнасці <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Спіс прыватнасці для %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "Парадак: %s, дзеянне: %s, тып: %s, значэнне: %s"
 
-#: ../src/dialogs.py:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Парадак: %s, дзеянне: %s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Змяніць правіла</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Дадаць правіла</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Спісы прыватнасці для %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Спісы прыватнасці"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Няправільная назва спіса"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Вы павінны вызначыць назву для новага спіса прыватнасці."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Вы не ўвайшлі ў пакой групавой размовы."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запрасіў Вас у групавую размову %(room_jid)s"
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Каментарый: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Выберыце гукавы файл"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Усе файлы"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Файлы Wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Выберыце малюнак"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Малюнкі"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Калі %s становіцца:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Дадаць асабістае нагадванне для %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "№"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "калі я "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7294,38 +7316,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7335,78 +7357,78 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Іншыя"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Канферэнцыі"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Вы не можаце праглядзець спіс даступных сервісаў, не злучыўшыся з серверам."
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук сервісаў для рахунка %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Пошук сервісаў"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Немагчыма знайсці сервіс"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7414,98 +7436,103 @@ msgstr ""
 "Па вызначаным адрасе няма сервісаў, альбо яны не адказваюць на запыты. "
 "Праверце адрас і паспрабуйце зноў."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Немагчыма праглядзець сервіс"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў."
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Няправільнае імя карыстальніка"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Прагляд %s для рахунка %s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Праглядзець"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Гэты сервіс не ўтрымлівае ў сабе элементаў, якія можна праглядзець."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Выканаць загад..."
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Зарэ_гістравацца"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук у %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Карыстальнікі"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Апісанне"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Змясціць у закладках"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Закладка ўжо ўсталяваная"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групавая размова \"%s\" ужо знаходзіцца ў Вашых закладках."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Закладка паспяхова дададзеная"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Вы можаце рэдагаваць спіс Вашых закладак праз меню \"Дзеянні\" галоўнага "
 "вакна."
 
-#: ../src/disco.py:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Падпісаны"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 #, fuzzy
 msgid "Node"
 msgstr "Ніякі"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Новы допіс"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "Падп_ісацца"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Адпісацца"
 
@@ -7554,7 +7581,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7720,102 +7747,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "Здольнасці сервера"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Файл"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Час"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Ступень выкананасці"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Памер: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Вы"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Адпраўнік: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Атрымальнік: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Захаваць у: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Перадача файла скончаная"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Адкрыць дырэкторыю з файлам"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Перадача файла скасаваная"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "Немагчыма ўсталяваць злучэнне з атрымальнікам."
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Атрымальнік: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Памылка: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Перадача файла спыненая"
@@ -7824,7 +7839,7 @@ msgstr "Перадача файла спыненая"
 msgid "Choose File to Send..."
 msgstr "Выберыце файл..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Апісанне: %s"
@@ -7857,33 +7872,33 @@ msgstr "Апісанне: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s хоча адправіць Вам файл:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Немагчыма перапісаць наяўны файл \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Файл з такой назвай ужо існуе, а Вы не маеце правоў на яго перазапіс."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Такі файл ужо ёсць"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Немагчыма запісваць файлы ў дырэкторыю \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Вы не маеце права ствараць файлы ў гэтай дырэкторыі."
 
@@ -7919,72 +7934,56 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Немагчыма адправіць пусты файл"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Назва:"
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Адпраўнік:"
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Прыпыніць"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Працягнуць"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim патрабуе запуску сервера X. Выхад..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim патрабуе PyGTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim патрабуе GTK 2.6 альбо вышэйшай версіі для запуску. Выхад..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ не падтрымлівае libglade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr "Выдаліце бібліятэку GTK+ і ўсталюйце найноўшую стабільную версію з %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Праверце, ці падтрымліваюць бібліятэкі GTK+ і PyGTK сродкі libglade."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim патрабуе PySQLite2 для запуску"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim патрабуе pywin32 для запуску"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7992,11 +7991,11 @@ msgid ""
 msgstr "Праверце, ці ўсталяваны Pywin32. Вы можаце сцягнуць яго з %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim ужо працуе"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8039,8 +8038,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "рахунак"
 
@@ -8062,12 +8061,15 @@ msgid "status"
 msgstr "стан"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "адзін з: offline, online, chat, away, xa, dnd, invisible "
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "паведамленне"
 
@@ -8303,76 +8305,95 @@ 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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Апрацоўваць спасылкі xmpp:/"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "спасылка"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "змест паведамлення"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Увайсці ў размоўны пакой"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "пакой"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Пакой:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "мянушка"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Мянушка не знойдзеная: %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Паролі розняцца"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Праверце, ці працуе avahi-daemon."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Паказаць / схаваць галоўнае вакно"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Не хапае аргумента \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8381,31 +8402,31 @@ msgstr ""
 "'%s' няма ў Вашым спісе.\n"
 "Калі ласка, вызначце рахунак для адпраўкі паведамлення."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "У Вас няма актыўнага рахунка"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s не знойдзены"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8414,7 +8435,7 @@ msgstr ""
 "Карыстанне: %s загад [аргументы]\n"
 "Загад ёсць адным з:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8423,7 +8444,7 @@ msgstr ""
 "Надта шмат аргументаў. \n"
 "Увядзіце \"%s help %s\" для падрабязнейшых звестак"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8432,7 +8453,11 @@ msgstr ""
 "Аргумент \"%s\" не вызначаны. \n"
 "Увядзіце \"%s help %s\" для падрабязных звестак"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Няправільная спасылка"
 
@@ -8462,198 +8487,199 @@ msgstr "Вы не можаце выдаліць актыўную тэму"
 msgid "Please first choose another for your current theme."
 msgstr "Спачатку актывізуйце іншую тэму."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Памылка адпраўкі прыватнага паведамлення"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Уставіць мянушку"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Журнал размоў"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Злучэнне"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Новы рахунак паспяхова створаны"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Для %(nick)s забаронена казанне: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s забараніў казанне для %(nick)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вашая мянушка змененая на %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s змяніў мянушку на %s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Адносіны: "
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s пакараны: %(reason)s"
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s сышоў"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s далучыўся да групавой размовы"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 цяпер %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1690
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Калі Вы закрыеце гэтае вакно, Вы выйдзеце з гэтай групавой размовы."
 
-#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Больш не пытацца"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Змяненне тэмы"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Вызначце новую тэму:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Змена мянушкі"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Вызначце сваю новую мянушку:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Апісанне: %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Пакаранне %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Вы можаце вызначыць прычыну:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Забарона казання для %s"
@@ -8674,61 +8700,61 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Паведаміць пра памылку"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Падрабязнасці"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Памылка: немагчыма прачытаць %s"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Памылка чытання файла:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 msgid "Error parsing file:"
 msgstr "Памылка разбору файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не з'яўляецца прадвызначанай Jabber-праграмай"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ці Вы хочаце зрабіць Gajim прадвызначанай Jabber-праграмай?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Заўсёды пры запуску спраўджваць, ці з'яўляецца Gajim прадвызначанай Jabber-"
 "праграмай"
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Пашырэнне не падтрымліваецца"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Захаваць малюнак як..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8738,161 +8764,161 @@ msgstr ""
 "Гэтая мянушка ўжо ўжытая альбо зарэгістраваная іншым чалавекам.\n"
 "Выберыце іншую мянушку:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Хочаце задаволіць гэты запыт?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) аўтарызацыя для %s (id: %s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Памылка злучэння"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "памылка адпраўкі %s ( %s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Запыт падпіскі"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Паспяховая аўтарызацыя"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Чалавек \"%s\" дазволіў Вам бачыць змены яго стану."
 
-#: ../src/gui_interface.py:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Чалавек \"%s\" забраў у Вас аўтарызацыю"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Адпісацца"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Немагчыма злучыцца з \"%s\""
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Каб удзельнічаць у гэтай групавой размове, трэба ведаць пароль."
 
-#: ../src/gui_interface.py:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы злучаны без выкарыстання ключа OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Пароль няправільны"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Пароль няправільны"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 "Кіраўнік пароляў Gnomekeyring усталяваны, але няправільна выконваецца "
 "(магчыма, зменная асяроддзя выстаўленая няправільна)"
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новая пошта на %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8900,7 +8926,7 @@ msgstr[0] "%d новы ліст"
 msgstr[1] "%d новыя лісты"
 msgstr[2] "%d новых лістоў"
 
-#: ../src/gui_interface.py:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8910,102 +8936,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Выдаліць чалавека з спіса"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Памылка чытання файла:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Файл %(filename)s паспяхова атрыманы ад %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1454
+#: ../src/gui_interface.py:1479
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Перадача файла %(filename)s ад %(name)s спыненая."
 
-#: ../src/gui_interface.py:1467
+#: ../src/gui_interface.py:1492
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Вы паспяхова адправілі файл %(filename)s для %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1471
+#: ../src/gui_interface.py:1496
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Перадача файла %(filename)s для %(name)s спыненая."
 
-#: ../src/gui_interface.py:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Для кожнага _паведамлення"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Вызначце імя карыстальніка для мясцовага рахунка"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Канфлікт імёнаў карыстальнікаў"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хоча адправіць Вам файл."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запыт на перадачу файла"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9013,15 +9040,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9032,90 +9059,100 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Злучэнне"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+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"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Шыфраванне адключанае"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Немагчыма захаваць настаўленні"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Патрэбны пароль"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Вызначце пароль GPG для рахунка %s."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Няправільны пароль"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкніце Скасаваць."
 
@@ -9124,37 +9161,37 @@ msgstr "Паўтарыце ўвод пароля GPG альбо пстрыкні
 msgid "_New Group Chat"
 msgstr "Новая групавая размова"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Я хачу дадаць Вас у мой кантактны ліст"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Немагчыма адшукаць базу дадзеных"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Людзі"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Мянушка"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Паведамленне"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9162,7 +9199,7 @@ msgstr ""
 "Вы сапраўды хочаце ачысціць базу дадзеных? (Увага: закрыйце Gajim перад "
 "працягам)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9176,27 +9213,27 @@ msgstr ""
 "\n"
 "Калі Вы выбралі Так, пачакайце..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Экспартаванне журналаў..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s а %(time)s сказаў: %(message)s\n"
 
-#: ../src/history_manager.py:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Гэтае дзеянне не аднаўляецца."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
@@ -9236,38 +9273,38 @@ msgstr "Цяперашні стан: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Цяперашні стан: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Немагчыма загрузіць малюнак"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Вы не злучаны з серверам"
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Вы сапраўды хочаце выдаліць выбранае паведамленне?"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Размовы"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Групавыя размовы"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Прыватныя размовы"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Паведамленні"
 
@@ -9279,22 +9316,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змяніў стан"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s прыйшоў"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s сышоў"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новае асобнае паведамленне ад %(nickname)s"
@@ -9319,7 +9356,7 @@ msgstr "Новае паведамленне ад %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Новае паведамленне ад %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "дзевяць"
@@ -9328,12 +9365,12 @@ msgstr "дзевяць"
 msgid "Retrieving profile..."
 msgstr "Чытанне профіля..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "Месца файла"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "Такой групавой размовы няма."
@@ -9341,7 +9378,7 @@ msgstr "Такой групавой размовы няма."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Немагчыма загрузіць малюнак"
 
@@ -9374,51 +9411,51 @@ msgstr ""
 "У часе абнаўлення Вашых асабістых звестак адбылася памылка, паспрабуйце "
 "абнавіць пазней."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Аб'яднаныя рахункі"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Адпраўленая аўтарызацыя"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Цяпер \"%s\" можа бачыць Ваш стан."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Адпраўлены запыт на падпіску"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Калі \"%s\" задаволіць гэты запыт, Вы зможаце бачыць яго стан."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Аўтарызацыя забраная"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Цяпер \"%s\" будзе заўсёды бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы злучыцеся з %s без падтрымкі OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Вы ўдзельнічаеце ў некалькіх групавых размовах"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9426,28 +9463,39 @@ msgstr ""
 "Змяніўшы свой стан на нябачны, Вы такім чынам выйдзеце з гэтых групавых "
 "размоў. Вы сапраўды хочаце стаць нябачным?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы сапраўды хочаце сысці з групавой размовы \"%s\"?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Скасаваць перадачу файла"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Ёсць нечытаныя паведамленні"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9456,95 +9504,95 @@ msgstr ""
 "Вы зможаце прачытаць нечытаныя паведамленні толькі з уключаным вядзеннем "
 "журналаў размоў."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Вы павінны прачытаць іх перад выдаленнем гэтага транспарта."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспарт \"%s\" будзе выдалены"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "Вы больш не зможаце мець зносіны з людзьмі праз гэты транспарт."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Транспарты будуць выдаленыя"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, 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:2653
+#: ../src/roster_window.py:2731
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Змяніць імя чалавека"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Вызначце новую мянушку для чалавека %s."
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Змяніць назву групы"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Вызначце новую назву групы %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Выдаліць групу"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Хочаце выдаліць групу %s з кантактнага ліста?"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Таксама выдаліць усіх людзей з гэтай групы"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Прызначыць ключ OpenPGP"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Выберыце ключ для гэтага чалавека"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" будзе выдалены з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9553,12 +9601,12 @@ msgstr ""
 "прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас адлучаным."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Што Вы хочаце зрабіць?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9567,16 +9615,16 @@ msgstr ""
 "чынам таксама прыбярэце ў яго аўтарызацыю, і ён заўсёды будзе бачыць Вас "
 "адлучаным."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 msgid "I want this contact to know my status after removal"
 msgstr "Я хачу, каб гэты чалавек мог бачыць мой стан пасля выдалення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Людзі будуць выдаленыя з Вашага кантактнага ліста"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9586,32 +9634,32 @@ msgstr ""
 "з Вашага кантактнага ліста, Вы такім чынам таксама прыбярэце ў іх "
 "аўтарызацыю, і яны заўсёды будуць бачыць Вас адлучаным."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Рахункаў няма"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Вы павінны стварыць рахунак, каб размаўляць з іншымі людзьмі."
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не падтрымлівае сховішча мета-кантактаў"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9620,12 +9668,12 @@ msgstr ""
 "Сервер не падтрымлівае мета-кантакты. Гэтае настаўленне не захаваецца для "
 "наступных сеансаў."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы ствараеце мета-кантакт. Вы сапраўды хочаце працягнуць?"
 
-#: ../src/roster_window.py:3986
+#: ../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 "
@@ -9635,12 +9683,12 @@ msgstr ""
 "кантактнага ліста. Звычайна ўжываецца, калі ў чалавека некалькі рахункаў "
 "Jabber альбо некалькі транспартных рахункаў."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Няправільны файл"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9648,12 +9696,12 @@ msgstr[0] "%s хоча адправіць Вам файл:"
 msgstr[1] "%s хоча адправіць Вам файл:"
 msgstr[2] "%s хоча адправіць Вам файл:"
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Адправіць %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Зрабіць %s і %s мета-кантактамі"
@@ -9663,134 +9711,138 @@ msgstr "Зрабіць %s і %s мета-кантактамі"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "выкарыстоўвае рахунак %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "рахунку %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "выкарыстоўвае рахунак %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Кіраванне закладкамі..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "рахунка %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "для рахунка %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "З_мяніць паведамленне аб стане"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Абнавіць"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Праглядзець сервісы..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Ад_правіць групавое паведамленне"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Усім карыстальнікам"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Усім актыўным карыстальнікам"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Змяніць імя чалавека"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Змяніць _групы"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ад_правіць асобнае паведамленне"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Выканаць загад..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Транспарты"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Паказаць _транспарты"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "Змяніць _імя"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Чалавек адлучыўся"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Чалавек адлучыўся"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Кіраўнік журналаў"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Удзельнічаць у групавой размове"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Змяніць паведамленне стану..."
 
@@ -9825,9 +9877,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9840,119 +9892,129 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Змяніць паведамленне стану..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Няма ў спісе"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Схаваць гэтае меню"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Рэсурс: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s гэтай групавой размовы"
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Стан: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Апошняе паведамленне: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " ад %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "Злучэнне"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "Чалавек адлучыўся"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Падпіска: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Тып:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Змяненне рахунка"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Сцягнуць"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Загрузіць"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Тып: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Перададзена: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Не пачатая"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Спыненая"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Скончаная"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Прыпыненая"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Марнаванне часу"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Перадача"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Гэты сервіс яшчэ не адказаў на запыт падрабязных звестак"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9960,64 +10022,371 @@ msgstr ""
 "Гэты сервіс не дае падрабязных звестак.\n"
 "Хутчэй за ўсё, гэты сервіс састарэлы ці зламаны"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?Сістэма:Невядомая"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Праграма:Невядомая"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "ад %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Праграмы</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "Вы не цікавіцеся гэтым чалавекам, але ён цікавіцца Вамі"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "Вы цікавіцеся чалавекам, але ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы і гэты чалавек абодва цікавіцеся адзін адным"
 
 #. None
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Вы не цікавіцеся чалавекам, і ён не цікавіцца Вамі"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы чакаеце адказу на Ваш запыт"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " рэсурс з прыярытэтам "
 
+#, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Удзельнічаць у _групавой размове"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Дадаць чалавека..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Пошук сервісаў"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Выканаць загад..."
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "Змяніць рахунак"
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Асабістыя звесткі"
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "_Пачаць размову"
+
+#~ msgid "_Status"
+#~ msgstr "_Стан"
+
+#~ msgid "Account Modification"
+#~ msgstr "Змяненне рахунка"
+
+#~ msgid ""
+#~ "Check this so Gajim will connect in port 5223 where legacy servers are "
+#~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+#~ "default if broadcasted by the server, and with this option enabled TLS "
+#~ "will be disabled"
+#~ msgstr ""
+#~ "Скарыстайце гэтую опцыю, калі хочаце, каб Gajim злучаўся з серверам праз "
+#~ "порт 5223, праз які старыя серверы даюць мажлівасць выкарыстання SSL. "
+#~ "Зважайце, што Gajim звычайна выкарыстоўвае шыфраванне TLS, калі "
+#~ "звяртаецца да сервера, а гэтая опцыя адключыць выкарыстанне TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Змяніць асабістыя звесткі..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Назва вузла: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Калі гэтая опцыя ўключаная, Gajim будзе захоўваць пароль у файле ~/.gajim/"
+#~ "config з правамі чытання толькі для Вас"
+
+#~ msgid "Port: "
+#~ msgstr "Порт: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Проксі:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Захоўваць _пароль (небяспечна)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Адпраўляць праверачныя пакункі серверу"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Ужыць _SSL (састарэлая опцыя)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Адпаведна стану"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Выдаліць MOTD"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "Ад_правіць паведамленне серверу"
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Атрыманае паведамленне\n"
+#~ "Чалавек адлучыўся \n"
+#~ "Чалавек змяніў стан \n"
+#~ "Фарбаванае паведамленне групавой размовы \n"
+#~ "Атрыманае групавое паведамленне \n"
+#~ "Запыт на перадачу файла \n"
+#~ "Перадача файла пачалася \n"
+#~ "Перадача файла скончаная"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "людзі\n"
+#~ "групы\n"
+#~ "усе"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Удзельнічаць у _групавой размове"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Скапіяваць JID / паштовы адрас"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Скапіяваць адрас спасылкі"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Напісаць ліст"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Адкрыць у праглядальніку"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Пачаць размову"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Шэраг рахункаў\n"
+#~ "Шэраг групаў\n"
+#~ "Шэраг людзей\n"
+#~ "Банер размовы"
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "Змяніць м_янушку"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "Змяніць _тэму"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Настаўленні _пакоя"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Кіраванне закладкамі"
+
+#~ msgid "Send _File"
+#~ msgstr "Адправіць _файл"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Дадаць у кантактны ліст"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "Ад_правіць прыватнае паведамленне"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Кіраванне рахункамі"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "Выдаліць"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Дадаць чалавека ў спіс"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Змясціць у закладках"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Змяніць м_янушку"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "сочыць за размовай"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Пстрыкніце, каб уставіць сымболік (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Усе станы\n"
+#~ "Толькі пісанне\n"
+#~ "Адключана"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Аўтаматычна вызначаць пры кожным запуску Gajim\n"
+#~ "Заўсёды карыстацца праграмамі, прызначанымі ў GNOME\n"
+#~ "Заўсёды карыстацца праграмамі, прызначанымі ў KDE\n"
+#~ "Адмысловы"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ніводны\n"
+#~ "абодва\n"
+#~ "ад\n"
+#~ "каму"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Выдаліць"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "_Дадаць чалавека..."
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "Здольнасці сервера"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Перадача _файлаў"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Профіль, а_ватар"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Рахункі"
+
+#~ msgid "_Contents"
+#~ msgstr "_Змест"
+
+#~ msgid "_FAQ"
+#~ msgstr "_Частыя пытанні"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Настаўленні"
+
+#~ msgid "_Quit"
+#~ msgstr "_Выйсці"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Адправіць _асобнае паведамленне..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Адправіць _асобнае паведамленне"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Ст_ан"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Групавая размова"
+
+#~ msgid "Enable"
+#~ msgstr "Уключыць"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Змяніць рахунак..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Няправільны вузел"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr ""
+#~ "Залежнасць ад pysqlite2 (aka python-pysqlite2) не выкананая. Выхад..."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ не падтрымлівае libglade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Выдаліце бібліятэку GTK+ і ўсталюйце найноўшую стабільную версію з %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Праверце, ці падтрымліваюць бібліятэкі GTK+ і PyGTK сродкі libglade."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim патрабуе PySQLite2 для запуску"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Уваходнае паведамленне:"
 
@@ -10214,10 +10583,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "Gajim account %s"
 #~ msgstr "Рахунак Gajim %s"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Адмысловы</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Паўторны Jabber ID"
 
@@ -10296,9 +10661,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Рамэа і Джульета</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Старыя казкі"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Маналог"
 
@@ -10412,9 +10774,6 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "Выстаўляць паведамленне стану з улікам _гранай музыкі"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Паказваць толькі ў _галоўным вакне"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Паведамленне аб аўтаматычным сыходзе"
 
@@ -10448,18 +10807,9 @@ msgstr " рэсурс з прыярытэтам "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Адмысловыя настаўленні нагадванняў..."
 
-#~ msgid "_Never"
-#~ msgstr "_Ніколі"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Паведамляць мне пра гэта"
-
 #~ msgid "_Player:"
 #~ msgstr "_Прайгравальнік:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Вынырваць"
-
 #~ msgid "City:"
 #~ msgstr "Горад:"
 
diff --git a/po/be@latin.po b/po/be@latin.po
index 4dcbfe38b..175bb0974 100644
--- a/po/be@latin.po
+++ b/po/be@latin.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -18,63 +18,11 @@ 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/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Klijent Jabber dla GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
-msgid "Join _Group Chat..."
-msgstr "Dałučysia da _pakoju"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Dadaj kantakt..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Šukaj servisy"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Vykanaj zahad..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Madyfikuj kont"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Adčyni poštu Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Asabistyja źviestki"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Pačni razmovu"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -85,83 +33,90 @@ msgstr ""
 "\n"
 "Kali łaska, pačakaj..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Kali łaska, abiary adnu z nastupnych opcyjaŭ:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, 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/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Dałučysia pa nacisku knopki \"Skonč\""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Stvareńnie kontu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Ja ŭžo maju patrebny kont"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Ja chaču za_rehistravać novy kont"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Kali ŭklučanaja hetaja opcyja, Gajim zapomnić parol dla hetaha kontu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Kiruj..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Nijaki"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Zachavaj _parol"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Nastaŭ profil paśla złučeńnia"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Skarystaj admysłovy host/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -169,149 +124,145 @@ msgstr ""
 "Ty musiš mieć kont, kab dałučycca da sietki\n"
 "Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Dadatkovyja"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Skonč"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Nazva hosta: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Parol:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Roznaje</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Asabistyja źviestki</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Ułaścivaści</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Dastasuj da statusu"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Kont"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Madyfikacyja kontu"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Konty"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Śpis administrataraŭ"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Užyvaj aŭtaryzacyju"
+
+#: ../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"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Zlučajsia pry starcie Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Ź_miani parol"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Paznač hetuju opcyju, kali chočaš, kab Gajim złučaŭsia z serveram praz port "
-"5223, praź jaki staryja servery dajuć mažlivaść vykarystańnia SSL. Zvažaj: "
-"Gajim zvyčajna vykarystoŭvaje šyfravańnie TLS, kali źviartajecca da servera, "
-"a hetaja opcyja adklučaje vykarystańnie TLS"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Abiary _kluč..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Klikni, kab źmianić parol dla kontu"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "_Zlučajsia pry starcie Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Złučeńnie"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Źmiani asabistyja źviestki..."
+#: ../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 "Imia:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Ahulnaja"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Nazva hosta: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -319,8 +270,12 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim zojmie dadatkovyja adrasy IP, kab "
 "pieradača fajłaŭ było šparčejšym."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, 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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -328,16 +283,7 @@ 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/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Kali ŭklučanaja hetaja opcyja, Gajim budzie zachoŭvać parol u fajle ~/.gajim/"
-"config z pravami na čytańnie tolki dla ciabie"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -345,8 +291,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie aŭtamatyčna dałučacca da servera "
 "praz hety kont"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -355,47 +300,49 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, to źmieny glabalnaha statusu (z menu ŭnizie "
 "śpisu kantaktaŭ) buduć upłyvać na status hetaha kontu"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Źviestki pra ciabie, jakija zachoŭvajucca na servery"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 "JID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Proźvišča:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Źlej konty ŭ adno"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Kluč nie abrany"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Nijaki"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Asabistyja źviestki"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Pryjary_tet:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -405,22 +352,20 @@ msgstr ""
 "kali niekalki prahram dałučanyja praz adzin kont. Prahrama z najvyšejšym "
 "pryjarytetam budzie atrymvać paviedamleńni"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Źmianiaj pryjarytet aŭtamatyčna zhodna z statusam."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "_Źmiani nazvu"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "_Krynica:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -433,212 +378,99 @@ msgstr ""
 "i z domu, i z pracy. Paviedamleńni buduć skiroŭvacca na krynicu z "
 "najvyšejšym pryjarytetam. (hladzi nižej)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Zachavaj _parol (niebiaśpiečna)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Zachoŭvaj _žurnały razmoŭ dla ŭsich kantaktaŭ"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Dasyłaj pravieračnyja infarmacyjnyja pakiety"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "_Synchranizuj status kontu z glabalnym statusam"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Pakažy _adłučanyja kantakty"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Skarystaj _SSL (zastarełaja opcyja)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Skarystaj proxy dla pieradačy fajłaŭ"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Dastasuj da statusu"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Imia:"
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Ułaścivaści</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "_Dastasuj da statusu"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Konty"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Užyvaj aŭtaryzacyju"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "_Zlučajsia pry starcie Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Imia:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, 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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "JID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Proźvišča:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Źlej konty ŭ adno"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "_Źmiani nazvu"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Dasyłaj pravieračnyja infarmacyjnyja pakiety"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "_Synchranizuj status kontu z glabalnym statusam"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Pakažy _adłučanyja kantakty"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Skarystaj admysłovy host/port"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Užyvaj admysłovy port:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Skarystaj proxy dla pieradačy fajłaŭ"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Źmiani asabistyja źviestki..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Ukluč"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Nazva hosta: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Kiruj..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Port:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Kont:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Dadaj novy kantakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -650,7 +482,7 @@ msgstr ""
 "Klikni pa knopcy rehistracyi\n"
 "dla praciahu."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -658,693 +490,746 @@ msgstr ""
 "Treba złučycca z šluzam, kab mahčy dadavać kantakty\n"
 "z hetaha pratakołu."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Hrupa:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Mianuška:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Pratakoł:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Rehistruj"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Adbyłasia pamyłka:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Abiary zahad dla vykanańnia:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Zahady ad-hoc - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Spraŭdź nanoŭ"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Apisańnie pamyłki..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Kali łaska, pačakaj kanca atrymańnia śpisu zahadaŭ..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Kali łaska, pačakaj kanca dasyłańnia zahadu..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Kali łaska, pačakaj..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Hety abjekt Jabber nia maje dastupnych zahadaŭ."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Apisańnie</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Redaktar dadatkovych naładaŭ"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Vydal MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Vydal paviedamleńnie dniu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Śpisy pryvatnaści"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Dašli paviedamleńnie karystalnikam, dałučanym da servera"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Vyznač MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Vyznač paviedamleńnie dniu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Pakažy _kansol XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Aktualizuj MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Aktualizuj paviedamleńnie dniu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administratar"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Dašli paviedamleńnie servera"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Dziejańni</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Umovy</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Huki</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Admysłovyja dziejańni"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Pašyranyja nałady nahadvańnia"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Usie statusy"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Adyjšoŭ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Zaniaty"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Niabačny"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Vykanaj zahad"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Niedastupny"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Adzin ci niekalki admysłovych statusaŭ..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Dałučany / Achvotna parazmaŭlaju"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Ahuč"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Atrymaŭ paviedamleńnie\n"
-"Kantakt adłučyŭsia \n"
-"Kantakt źmianiŭ status \n"
-"Padśvietlenaje paviedamleńnie ŭ hrupavoj razmovie \n"
-"Atrymaŭ hrupavoje paviedamleńnie \n"
-"Zapyt na pieradaču fajłu \n"
-"Pieradača fajłu pačałosia \n"
-"Pieradača fajłu skončyłasia"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Nie adčyniaj aŭtamatyčna voknaŭ razmovy"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Nie pakazvaj vypłyŭnych voknaŭ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Nie ahučvaj hetaj padzieji"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Nie pakazvać paviedamleńniaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Nie pakazvać padziejaŭ u poli nahadvańnia"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Paviedam mnie ŭ vypłyŭnym aknie"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Adčyni akno razmovy z karystalnikam"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Pakazvaj padzieju ŭ śpisie kantaktaŭ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Pakazvaj padzieju ŭ poli nahadvańnia"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "u časie, kali "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kantakt(y)\n"
-"hrupa(y)\n"
-"kožny"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "dla "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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 "
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Zapis:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Nazva kanału:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Apošniaja źmiena:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Atrymaŭ novy zapis"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Atrymaŭ novy zapis:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "Kantakty"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Huki</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Źmiani parol"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Paŭtary parol dla paćvierdžańnia:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Uviadzi novy parol:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Dziejny"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Pakoj:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Šablony paviedamleńniaŭ statusu:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Zachavaj jak šablon..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Dałučysia da _pakoju"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "№"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Dadaj u śpis kantaktaŭ"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "S_kapijuj JID/Email"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "S_kapijuj adras spasyłki"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Adčyni paštovuju prahramu"
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Adčyni spasyłku ŭ hartačy"
+#. 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 "_Vyšli"
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Pačni razmovu"
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "_Zaprasi"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "Naziralniki"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "Dadaj admysłovaje _nahadvańnie"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "Pryznač kluč Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Vykanaj zahad..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Źmiani _hrupy"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "_Zaprasi"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kantakty"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Vydal"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Dasyłaje svoj XML"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Dašli _asobnaje aviedamleńnie..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "Vyšli _fajł"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Pačni _razmovu"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Uklučy/Adklučy šyfravańnie Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Dadaj u śpis kantaktaŭ"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "Dazvol jamu/joj _bačyć moj status"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "Za_barani jamu/joj bačyć moj status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Žurnał razmoŭ"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "Źmiani _nazvu"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Aŭtaryzacyja"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "dziaviataja"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Zapoŭni formu."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Kanfihuracyja pakoju"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Źmiani hrupy"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Apisańnie</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Zdolnaści serveraŭ"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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ŭ"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Anuluj pieradaču fajła"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Anuluj abranuju pieradaču fajła"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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ł"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Pry_biarysia"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Pieradačy fajłaŭ"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Schavaj akno"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Vydal pieradaču fajła ź śpisu."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Praciahni"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Nahadaj mnie ab zakančeńni pieradačy fajła"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Adčyni kataloh z fajłam"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Prypyni"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "śpis pieradačaŭ fajłaŭ"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Kolery kartak u aknie razmoŭ</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Kont\n"
-"Hrupa\n"
-"Kantakt\n"
-"Baner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Kont"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Tłusty"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../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"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kantakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Styl šryftu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Kanfihuracyja temy Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Vyjšaŭ"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Hrupa"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Pasiŭny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Nachileny"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1352,7 +1237,7 @@ msgstr ""
 "MUC\n"
 "Paviedamleńni"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1360,116 +1245,74 @@ msgstr ""
 "Razmova\n"
 "Paviedamleńni"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Prypynienaja"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Koler _tekstu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Šryft:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Fon:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "Źmiani _mianušku"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "Źmiani _temu"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "Kanfihuruj _pakoj"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Stvary zakładku dla hetaja pakoju"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-#, fuzzy
-msgid "_Destroy Room"
-msgstr "Apisańnie: %s"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Kiruj zakładkami"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Ma_deratar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Dziejańni haspadara"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Vyšli _fajł"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Dadaj u śpis kantaktaŭ"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Administratar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "Za_blakuj"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Vypchni"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Udzielnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Uładalnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Dasłać pryvatnaje paviedamleńnie"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Daj hołas"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Stvary novy zapis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Ad"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Tema"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1485,26 +1328,20 @@ 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/glade/history_manager.glade.h:3
+#: ../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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Vydal"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Ekspartuj"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Kiraŭnik žurnałaŭ razmoŭ Gajim"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1513,428 +1350,443 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Šukaj u bazie žurnałaŭ"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Nazva kantaktu"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Pakoji"
+
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Šukaj"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Zachoŭvaj žurnał razmoŭ"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "_Stvary zakładku dla hetaja pakoju"
+msgid "Bro_wse Rooms"
+msgstr "_Prahladaj"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Dałučysia da pakoju"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Mianuška:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Parol:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Niadaŭna:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Pakoj:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Dałučysia"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Kiruj kontami"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Aŭtamatyčna dałučajsia"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Kiruj zakładkami"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Pakazvaj status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Zahałovak:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Kanfihuracyja pakoju"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Praciahni"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "Vydal"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Ułaścivaści</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Nałady</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr "Złučeńnie HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Kiruj profilami proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Parol:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Užyvaj aŭtaryzacyju"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "_URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Imia:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Typ:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Imia karystalnika:"
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Dadaje kantakt u śpis kantaktaŭ"
-
-#: ../data/glade/message_window.glade.h:2
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Stvary zakładku dla hetaja pakoju"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Źmiani _mianušku"
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "sočyć za razmovaj"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Klikni, kab ustavić smajlik (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Klikni, kab ustavić smajlik (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Klikni, kab ustavić smajlik (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Vyšli"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Parol"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Redaktar dadatkovych naładaŭ</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikacyi</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Dziejańni</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Dziejańni</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Redahuj praviła</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Kolery kartak u aknie razmoŭ</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Vizualnyja nahadvańni</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Umovy</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Asablivy</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Huki</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opcyi GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<i>Śpis pryvatnaści</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Šablony paviedamleńniaŭ statusu</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Ułaścivaści</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Dadaj praviła</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizualnyja nahadvańni</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Pašyranyja"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Pašyranyja"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Usie stany razmovy\n"
-"Tolki datyčnyja pisańnia\n"
-"Adklučana"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Usie statusy"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Raskryj źviestki pra _aperacyjnuju systemu"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Raskryj źviestki pra _aperacyjnuju systemu"
+
+#: ../data/gui/preferences_window.ui.h:28
 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/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Adyjšoŭ"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Spytaj paviedamleńnia statusu, kali ja:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Aŭtamatyčna vyznačać pry kožnym starcie Gajim\n"
-"Zaŭsiody karystacca prahramami, pryznačanymi dla GNOME\n"
-"Zaŭsiody karystacca prahramami, pryznačanymi dla KDE\n"
-"Inšyja"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "_Zlučajsia pry starcie Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 "Zaŭsiody pry starcie praviaraj, ci pryznačany Gajim _zmoŭčanym klijentam "
 "Jabber"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Uvod paviedamleńnia"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Kanfihuruj koler i šryft interfejsu"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nazva kantaktu"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Asablivy</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Adklučana"
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Pakazvaj dadatkovyja _padrabiaznaści ab emaiłu"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Pakazvaj a_vatary kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Pakazvaj paviedamleńni _statusu kantaktaŭ u śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1944,7 +1796,7 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba "
 "pakazvać u voknach razmoŭ."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1954,7 +1806,7 @@ msgstr ""
 "kantaktam. Tut ty možaš vyznačyć, jakija paviedamleńni statusu treba dasyłać "
 "surazmoŭcam."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1962,12 +1814,12 @@ msgstr ""
 "Gajim budzie paviedamlać ab adłučeńni kantaktaŭ ad servera ŭ pravym nižnim "
 "kucie ekranu"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Chavaje knopki ŭ aknie pakoju."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -1976,7 +1828,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie dałučacca da hetaha pakoju pry "
 "starcie"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1984,18 +1836,18 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
 "źviestki pra aŭtaraŭ novych listoŭ"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2003,7 +1855,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/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"
@@ -2011,7 +1863,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać paviedamleńni statusu "
 "kantaktaŭ u śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2019,7 +1871,15 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2027,7 +1887,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2035,14 +1895,14 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać avatary kantaktaŭ u "
 "śpisie kantaktaŭ i ŭ pakojach"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2054,14 +1914,14 @@ msgstr ""
 "što ŭ takim razie nichto, akramia kantaktaŭ z tvajho śpisu, nia zmoža dasłać "
 "tabie paviedamleńnie"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2070,7 +1930,7 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim taksama budzie paviedamlać dadatkovyja "
 "źviestki pra aŭtaraŭ novych listoŭ"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2080,13 +1940,13 @@ msgstr ""
 "kožnaha pratakołu (naprykład, kantaktu z MSN buduć adpaviadać ikony statusu "
 "MSN)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2094,79 +1954,104 @@ msgstr ""
 "Kali ŭklučanaja hetaja opcyja, Gajim budzie zamianiać ascii-smajliki "
 "(naprykład, ':)' ) na adpaviednyja hrafičnyja smajliki"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Hrupuj vokny:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "_Kiruj..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Nikoli"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Madyfikacyja kontu"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Paviedamlaj mnie ab kantaktach, jakija źmianiajuć status na: "
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Paviedam mnie pra heta"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Paviedamlaj mnie ab novych listach u skryni _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Asabistyja źviestki"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "_Ahučvaj"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Vynyrni"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Nałady"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Pakazvaj padzieju ŭ poli nahadvańnia"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Dałučajusia"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Adłučajusia"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2175,30 +2060,30 @@ msgstr ""
 "kolery i h.d.). Kali ŭklučanaja hetaja opcyja, Gajim budzie pakazvać tekst "
 "biez afarmleńnia."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Paradkuj kantakty pa statusie"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Standartny zbor _ikon statusu:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "Zatrymana"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2206,7 +2091,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2214,602 +2099,563 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Užyvaj _ikony transpartaŭ"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Užyvaj _zmoŭčany dla systemy"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Kali ŭčyniajecca novaja padzieja"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Tekst pamyłki: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "П_ерад мянушкай:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "Aŭtamatyčna źmianiać stan na \"_Adyjšoŭ\" praz:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Hartač:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Smajliki:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Kiraŭnik fajłaŭ:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Padśviatlaj słovy z pamyłkami"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ihnaruj padzieji ad kantaktaŭ, jakich niama ŭ śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ihnaruj afarmleńnie ŭvachodnych paviedamleńniaŭ"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Zachoŭvać u žurnale źmieny statusu kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Paštovaja prahrama:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Aŭtamatyčna źmianiać stan na \"_Niedastupny\" praz:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Adčyni..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Viarni zvyčajnyja kolery"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Pakazanyja nahadvańni statusu ŭ časie razmovy:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "Pa_viedamleńnie statusu:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "Dałučysia da _pakoju"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "chvilinaŭ"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Śpisy pryvatnaści:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Dadaj / Źmiani praviła</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Śpis praviłaŭ</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Śpis pryvatnaści</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Dziejny dla hetaj sesii"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Dziejny pry kožnym starcie"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "usim"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "pavodle aŭtaryzacyi"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Dazvol"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Admoŭ"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Paradak:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Śpis pryvatnaści"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "pavodle aŭtaryzacyi"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "pavodle hrupy"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"niama\n"
-"abiedźvie\n"
-"ad\n"
-"da"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Dvuchbakovaja"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Ad"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "pieršaja"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "druhaja"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "dasyłać mnie paviedamleńni"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "dasyłać mnie apytańni"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "dasyłać mnie paviedamleńni statusu"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "bačyć moj status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "Avatar:"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Birthday:</b>"
 msgstr "Narodziny:"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Asablivy</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../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/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Huki</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Addzieł:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-mail:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Dadatkovy adras:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Proźvišča:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Asablivy</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Chatniaja staronka:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Dadaj praviła</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Asablivy</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Mianuška:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefon:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Umovy</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Paštovy indeks:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Ułaścivaści</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Huki</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Nałady</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../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>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Huki</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Pra siabie"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Klikni, kab vystavić svoj avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Asabistyja źviestki"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Praca"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Što chočaš zrabić?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Vydal kont _tolki dla Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Vydal kont i dla Gajim, i na _servery"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Vydal"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Tak"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Vydal"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Dadaj kantakt..."
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Zdolnaści serveraŭ"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Pieradačy _fajłaŭ"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Častyja pytańni (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Dapamoha online"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil, a_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Pakažy _transparty"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Pakažy _adłučanyja kantakty"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Pakažy _śpis kantaktaŭ"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Konty"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Dziejańni"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Źmiest"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Źmianić"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_Častyja pytańni"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Dapamoha"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Nałady"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Skonč pracu"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Dašli _asobnaje aviedamleńnie..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Vyhlad"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "Kali łaska, pačakaj kanca atrymańnia śpisu zahadaŭ..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Šukaj"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "_Dadaj kantakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "Źviestki ab kantakcie"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "Š_ukaj"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Pierajdzi"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adras:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Zarehistrujsia na"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Ad:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Adkažy na hetaje paviedamleńnie"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Dašli"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Dašli paviedamleńnie"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Dašli paviedamleńnie i začyni akno"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Da:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Adkažy"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Dašli i začyni"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Aŭtaryzuj"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2817,187 +2663,202 @@ msgstr ""
 "Admoŭ na zapyt aŭtaryzacyi kantaktu, kab jon/jana nie mahli bačyć, kali ja "
 "dałučany"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Zapyt aŭtaryzacyi"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Admoŭ"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID kantaktu, ź jakim chočaš parazmaŭlać"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Ściš huki"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Vyšli _asobnaje paviedamleńnie"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Pakažy ŭsie niahledžanyja _padzieji"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Pakoj"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Dziejańni</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Asablivy</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Nałady</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "JID:"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Krynica:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Nałady</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Apisańnie</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Asablivy</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Kamentary"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Kanfihuruj _pakoj"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kantakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Źviestki ab kantakcie"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Bolš"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "Avatar:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Huki</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafik Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Uvod XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Ukluč"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Źviestki/Apytańnie (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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Paviedamleńnie"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "P_rysutnaść"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Madyfikuj kont..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lakalny JID:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Asabistyja źviestki"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Krynica:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Klijent Jabber dla GTK+"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3022,7 +2883,7 @@ msgstr "Cely lik"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Koler"
 
@@ -3161,134 +3022,134 @@ msgstr "Švedzkaja"
 msgid "Chinese (Ch)"
 msgstr "Kitajskaja (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Mova spraŭdžvańnia pravapisu"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Złučeńnie niemahčymaje"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "dziaviataja"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Mianuška"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "_Šryft:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Źviestki ab kantakcie"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Šyfravańnie ŭklučanaje"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Niama ŭ śpisie"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Śpis dziejnych, skončanych i spynienych pieradačaŭ fajłaŭ"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Užyvaj aŭtaryzacyju"
@@ -3296,58 +3157,58 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Hetaje paviedamleńnie zašyfravanaje]"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Tolki što atrymanaje paviedamleńnie ad \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3355,127 +3216,137 @@ msgstr ""
 "Kali ty začyniš hetuju kartku i kali žurnały nie vieducca, to hetaje "
 "paviedamleńnie źniknie nazaŭždy."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s maje ciapier status %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "stvarajecca baza žurnałaŭ"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "stvarajecca baza žurnałaŭ"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim zaviaršaje vykanańnie"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "stvarajecca kataloh %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Źmiani infarmacyju statusu"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Źmiani status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Akreśli typ bačnaści i apisańnie"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Dałučany"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Adyjšoŭ"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Nie turbavać"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Niabačny - adłučany"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Apisańnie statusu:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Status źmianiŭsia."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Pakiń pakoji"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s z pakoju %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Pakoji"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Ty pakinuŭ nastupnyja pakoji:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d niečytanaje paviedamleńnie"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3573,9 +3444,9 @@ msgid ""
 msgstr "Śpis (padzielenych prabiełami) zhornutych radkoŭ (kontaŭ i hrupaŭ)."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Zmoŭčany"
@@ -3861,11 +3732,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:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3874,7 +3745,7 @@ msgstr ""
 "kantaktu, jaki nia mieŭ avatara byłym razam, albo kali buferavany avatar "
 "sastareje."
 
-#: ../src/common/config.py:230
+#: ../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."
@@ -3882,7 +3753,7 @@ msgstr ""
 "Kali opcyja maje vartaść False, Gajim nie budzie pakazvać radki stanu, kali "
 "surazmoŭca źmianiaje status i/ci paviedamleńnie statusu."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3897,30 +3768,30 @@ msgstr ""
 "vartaść \"in_and_out\", Gajim budzie pakazvać tolki paviedamleńni ab "
 "dałučeńni/adłučeńni surazmoŭcaŭ."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Fonavy koler kantaktaŭ, kali jany tolki dałučylisia."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Fonavy koler kantaktaŭ, kali jany tolki adłučylisia."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pakazvaj avatara dla transpartu."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pakazvaj śpis kantaktaŭ na paneli zadańniaŭ."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3930,7 +3801,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:241
+#: ../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 "
@@ -3941,7 +3812,7 @@ msgstr ""
 "słać takija danyja SHA."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3961,34 +3832,34 @@ msgstr ""
 "pakazvajucca ŭ asobnych voknach. Zvažaj, što kab ubačyć źmieny, treba "
 "ŭruchomić Gajima nanoŭ."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Chavaje knopki ŭ aknie pakoju."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Chavaje baner u aknie pakoju"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Chavaje baner u aknie pryvatnaj razmovy"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Chavaje śpis naviednikaŭ pakoju."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3996,29 +3867,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Vodstup pry šmatmetavym pryznačeńni paviedamleńnia."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Dašli paviedamleńnie i začyni akno"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, 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:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4026,7 +3897,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:257
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4035,7 +3906,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:258
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4044,7 +3915,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: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 "
@@ -4054,7 +3925,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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4062,7 +3933,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:261
+#: ../src/common/config.py:262
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4071,7 +3942,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:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4079,7 +3950,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:263
+#: ../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"
@@ -4087,67 +3958,83 @@ 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:264
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4155,80 +4042,85 @@ msgstr ""
 "Pryjarytet budzie aŭtamatyčna źmianiacca zhodna tvajmu statusu. Pryjarytety "
 "akreślivajucca ŭ opcyjach autopriority_*."
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, 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:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Abychod dla Jabberd2"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4236,125 +4128,130 @@ 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:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ci vykarystoŭvajecca šyfravańnie OpenPGP dla hetaha kantaktu?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Mova, dla jakoj treba praviarać pravapis"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "\"all\" albo statusy, padzielenyja prabiełami"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' albo 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' albo ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Splu"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Chutka viarnusia"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Viarnusia praz paru chvilinaŭ."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Ja jem, možaš pakinuć mnie paviedamleńnie."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Hladžu film."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracuju"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Ja pracuju."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Ja razmaŭlaju pa telefonie."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Vyjšaŭ"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Vyjšaŭ ciešycca z žyćcia."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Dastupny."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Achvotna parazmaŭlaju."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Chutka viarnusia."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Niedastupny."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Nie turbavać."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Byvaj!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4362,106 +4259,98 @@ 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:476
+#: ../src/common/config.py:491
 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:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "zialony"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "bakaleja"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "čałaviek"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marski"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Niemahčyma adčytać modulu idle"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Niapravilny host"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Źviestki rehistracyi dla transpartu %s nie pryjšli ŭ čas"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Zarehistrujsia na %s"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Niapravilny JID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Mianuška nie dazvolenaja: %s"
@@ -4469,77 +4358,77 @@ msgstr "Mianuška nie dazvolenaja: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Niemahčyma dałučycca da pakoju"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Ty zablakavany ŭ hetym pakoji."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Takoha pakoju niama."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Stvareńnie pakojaŭ abmiežavanaje."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Treba karystacca zarehistravanaj na siabie mianuškaj."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ciabie niama ŭ śpisie ŭdzielnikaŭ."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "padpisany na %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zapyt adpiski ad %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ciapier adpisany ad %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4679,28 +4568,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Hetaje paviedamleńnie *zašyfravanaje* (Hladzi :JEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4709,108 +4598,108 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Złučeńnie dla kontu \"%s\" zhubiłasia"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Pieradałučysia samastojna."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Niapravilny adkaz"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Pravier złučeńnie albo pasprabuj paźniej."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Pravier złučeńnie albo paŭtary paźniej"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Pamyłka aŭtaryzacyi z \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Kali łaska, pravier pravilnaść loginu i parolu."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Pamyłka vydaleńnia śpisu pryvatnaści"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, fuzzy, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4819,45 +4708,45 @@ 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kantakty"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Nia ściahnuta z-za niabačnaha statusu"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Naziralniki"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transparty"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Niama ŭ śpisie kantaktaŭ"
 
@@ -4866,38 +4755,54 @@ msgstr "Niama ŭ śpisie kantaktaŭ"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Nie staje pysqlite2 (python-pysqlite2) dla vykananaja. Vychad..."
+#: ../src/common/dbus_support.py:54
+#, 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/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, 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"
+
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "Nazva kontu nia moža być pustoj."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Servis niedastupny: Gajim nie vykonvajecca, albo opcyja remote_control maje "
 "vartaść False"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Interfejs sesijaŭ niedastupny.\n"
+"Pasprabuj pračytać: http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Interfejs sesijaŭ niedastupny.\n"
 "Pasprabuj pračytać: http://trac.gajim.org/wiki/GajimDBus"
@@ -5065,206 +4970,206 @@ msgstr "Kaniec tydnia"
 msgid "Weekend!"
 msgstr "Vychodny!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Niapravilny znak u imiani karystalnika."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Patrabujecca adras servera."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Niapravilny znak u naźvie hostu."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Niapravilny znak u naźvie krynicy."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Zaniaty"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Zaniaty"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Niedastupny"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Achvotna parazmaŭlaju"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Achvotna parazmaŭlaju"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Dastupny"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Dastupny"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Dałučajusia"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Adyjšoŭ"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "Adł_učany"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Adłučany"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "N_iabačny"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?kantakt maje status:Nieviadomy"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?kantakt maje status:Jość pamyłki"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Najaŭnaja aŭtaryzacyja:Niama"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Dvuchbakovaja"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Zapyt (aŭtaryzacyi):Niama"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Aŭtaryzuj"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcyja kantaktu ŭ pakoji:Niama"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Maderatary"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Maderatar"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Udzielniki"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Naviedniki"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Naviednik"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Suviaź udzielnikaŭ pakoju:Niama"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Ułaśnik"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administratar"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Udzielnik"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "sočyć za razmovaj"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "robić štości inšaje"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "pierastaŭ pisać"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "začyniŭ akno/kartku razmovy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5272,22 +5177,22 @@ msgstr[0] "Dašli paviedamleńnie"
 msgstr[1] "Dašli paviedamleńnie"
 msgstr[2] "Dašli paviedamleńnie"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5295,12 +5200,49 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Kanfihuracyja pakoju"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5310,17 +5252,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Pamier: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "pamyłka: niemahčyma adčynić %s, kab adčytać"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "indeksavańnie bazy razmoŭ"
 
@@ -6028,19 +6027,19 @@ msgstr ""
 msgid "Writing"
 msgstr "Pracuju"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6048,12 +6047,12 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -6061,7 +6060,7 @@ msgstr ""
 "Mahčyma, inšaja kopija Gajim užo vykonvajecca. Pieradača fajłaŭ anulavanaja."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6132,26 +6131,22 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Pamyłka dadańnia servisu. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Adklučana"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Standartnyja šablony paviedamleńniaŭ statusu"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Ukluč"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Słoŭnik dla movy %s niedastupny"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6160,215 +6155,215 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "zahałovak statusu"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "tekst paviedamleńnia statusu"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Nazva"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Pieradałučycca?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nielha vykarystać OpenPGP na hetym kamputary"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Niepračytanyja paviedamleńni"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Pračytaj usie novyja paviedamleńni pierad vydaleńniem kontu."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Akno razmovy adčynienaje dla kontu %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Prahrama dałučanaja da servera"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Taki kont užo zaniaty"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 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:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Nazva kontu nia moža być pustoj."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Nazva kontu nia moža ŭtrymlivać prabiełaŭ."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kiruj kontami"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "JID musić mieć formu \"user@servername\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Abrany port musić być numeram portu."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Niemahčyma atrymać sakretnyja klučy"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Adbyłasia pamyłka ŭ časie atrymańnia sakretnych klučoŭ OpenPGP."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Vybar kluča OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Abiary svoj kluč OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Takoha kontu niama"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr "Treba stvaryć kont, kab redahavać asabistyja źviestki."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Niama złučeńnia z serveram"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Server nie padtrymvaje Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Server nia moža zachoŭvać asabistyja źviestki."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Kab źmianić nazvu kontu, treba pieradałučycca."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Kont Local užo isnuje."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Źmiani %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Zarehistrujsia na %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Śpis zablakavanych kantaktaŭ"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Śpis udzielnikaŭ"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Śpis ułaśnikaŭ"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Śpis administrataraŭ"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Pryčyna"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Mianuška"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Funkcyja"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Blakavańnie..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6376,11 +6371,11 @@ msgstr ""
 "<b>Kaho chočaš zablakavać?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Dadajecca ŭdzielnik..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6388,11 +6383,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić udzielnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Dadajecca ŭłaśnik..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6400,11 +6395,11 @@ msgstr ""
 "<b>Kaho chočaš zrabić ułaśnikam?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Dadajecca administratar..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6412,7 +6407,7 @@ msgstr ""
 "<b>Kaho chočaš zrabić administrataram?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6429,59 +6424,87 @@ msgstr ""
 "4. damen (adpaviadaje damen, jak karystalnik@damen,\n"
 "damen/krynica ci paddamen)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Vydalajecca kont %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Šyfravańnie adklučanaje"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Vymahaje parolu"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Uviadzi parol dla kontu %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Zachavaj parol"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Kali ty vydališ jaho, złučeńnie razarviecca."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Niemahvyma dałučycca"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Što chočaš zrabić?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Vydal kont _tolki dla Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Zmoŭčany"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Usie"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Tolki ŭvachod i vychad"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Niama"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Hetaja zakładka źmiaščaje niapravilnyja źviestki"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6489,31 +6512,31 @@ msgstr ""
 "zakładku."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Mianuška nie dazvolenaja: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Niapravilny zapis"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Kont paśpiachova dadany"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6523,34 +6546,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:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Novy kont paśpiachova stvorany"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Treba vyznačyć imia karystalnika, kab skanfihuravać hety kont."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6560,7 +6583,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6568,61 +6591,61 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Adbyłasia pamyłka padčas stvareńnia kontu"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Nazva kontu ŭžo vykarystoŭvajecca"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Kont z takoj nazvaj užo isnuje."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Dziejny"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Padzieja"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Atrymanaje pieršaje paviedamleńnie"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Atrymanaje novaje paviedamleńnie"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Paviedamleńnie dasłanaje"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Padśviatleńnie paviedamleńnia ŭ pakoji"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Novaje paviedamleńnie ŭ pakoji"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Novy list na skryncy GMail"
 
@@ -6642,45 +6665,45 @@ msgstr ""
 "Tekst pad hetaj rysaj addzialaje toj tekst, jaki ty jašče nia bačyŭ/nia "
 "bačyła"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Skonč pracu"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Dziejańni dla \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Pračytać artykuł u _Wikipedii"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Šukaj u _słoŭniku"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "U adrasie dla web-pošuku nie staje \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Šukaj u Web"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Adčyni jak _spasyłku"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6689,7 +6712,7 @@ msgstr[1] "Učora"
 msgstr[2] "Učora"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -6798,71 +6821,71 @@ 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Niapravilny identyfikatar karystalnika"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Identyfikatar karystalnika nia moža ŭtrymlivać krynicy."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ja chaču dadać ciabie ŭ svoj śpis kantaktaŭ."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kantakt užo jość u śpisie kantaktaŭ"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Hety kantakt užo jość u tvajim śpisie kantaktaŭ."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Identyfikatar karystalnika:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Jabber-klijent dla GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Versija GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Versija PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Dziejnyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Byłyja raspracoŭniki:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "PADZIAKI:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Ihar Hrachyshka <ihar.hrachyshka@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6873,109 +6896,109 @@ msgstr ""
 "Treba zainstalavać słoŭnik %s, kab praviarać pravapis, albo abrać inšuju "
 "movu ŭ opcyi speller_language."
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zapyt aŭtaryzacyi ad %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Užo ŭdzielničaješ u razmovie ŭ pakoji %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dałučysia da pakoju dla kontu %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Niapravilnaja nazva kontu"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, 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:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Niapravilny JID pakoju"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "JID pakoju ŭtrymlivaje niedazvolenyja znaki."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Heta nie pakoj"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Naźvie %s nie adpaviadaje nivodny pakoj."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 #, 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:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Kont \"%s\" dałučany da servera"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Pačni razmovu dla kontu %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Pačni razmovu"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6984,173 +7007,171 @@ msgstr ""
 "paviedamleńnie:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Złučeńnia niama"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, 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:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Niapravilny JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Niemahčyma razabrać \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 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:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Niapravilny parol"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Treba ŭvieści parol."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Paroli roźniacca"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Parolu ŭ abodvuch palach nie pavinny roźnicca."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kantakt dałučyŭsia"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kantakt adłučyŭsia"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Novaje paviedamleńnie"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Novaje asobnaje paviedamleńnie"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Novaje pryvatnaje paviedamleńnie"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Novy list"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Pamyłka pieradačy fajłu"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Pieradača fajłu skončana"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Pieradača fajłu spyniena"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Zaprašeńnie ŭ pakoj"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kantakt źmianiŭ status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Asobnaje paviedamleńnie z kontu %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Asobnaje paviedamleńnie"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Dašli %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Atrymana %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisaŭ:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kansol XML dla %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Kansol XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Zatrymana"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "_Madyfikuj"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Vydal"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7158,158 +7179,158 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 #, fuzzy
 msgid "Add"
 msgstr "Adras"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "_Madyfikuj"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Vydal"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "JID:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Hrupa"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Dadaj kantakt"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Śpis pryvatnaści <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Śpis pryvatnaści dla %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Paradak: %s, dziejańnie: %s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redahuj praviła</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dadaj praviła</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Śpisy pryvatnaści dla %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Śpisy pryvatnaści"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Niapravilnaja nazva śpisu"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Treba akreślić nazvu dla novaha śpisu pryvatnaści."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ty nie dałučyŭsia da pakoju."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact zaprasiŭ ciabie ŭ pakoj %(room_jid)s"
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Kamentar: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Abiary hukavy fajł"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Usie fajły"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Fajły ŭ Wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Abiary vyjavu"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Vyjavy"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kali %s maje status:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dadajecca admysłovaje nahadvańnie dla %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "№"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Umova"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "kali maju "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7317,38 +7338,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7358,77 +7379,77 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Inšyja"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Kanferencyja"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 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:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Prahlad servisaŭ dla kontu %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Prahlad servisaŭ"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Niemahčyma znajści servis"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7436,97 +7457,102 @@ msgstr ""
 "Niama servisu z akreślenym adrasam, albo jon nie adkazvaje. Pravier adras i "
 "pasprabuj znoŭ."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Niemahčyma ahladać hety servis"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Taki servis nia ŭtrymlivaje elementaŭ dla ahladańnia."
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Niapravilnaje imia karystalnika"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Prahlad %s dla kontu %s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Prahladaj"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Hety servis nia ŭtrymlivaje elementaŭ dla prahladu."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Vykanaj zahad..."
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "_Zarehistrujsia"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanavańnie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Karystalniki"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Apisańnie"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Identyfikatar"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Zakładka ŭžo dadana"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pakoj \"%s\" užo jość u tvajich zakładkach."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka paśpiachova dadanaja"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Aŭtaryzavany"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 #, fuzzy
 msgid "Node"
 msgstr "Nijaki"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Novy zapis"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Aŭtaryzuj"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Anuluj aŭtaryzacyju"
 
@@ -7575,7 +7601,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7741,102 +7767,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "Zdolnaści serveraŭ"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Fajł"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Prahres"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazva fajłu: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Dasłaŭ: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Atrymaŭ: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisany ŭ: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Pieradača fajłu skončana"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Adčyni kataloh z fajłam"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Pieradača fajłu anulavana"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Atrymoŭca: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Tekst pamyłki: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Pieradača fajłu spyniena"
@@ -7845,7 +7859,7 @@ msgstr "Pieradača fajłu spyniena"
 msgid "Choose File to Send..."
 msgstr "Abiary fajł dla adsyłańnia..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Apisańnie: %s"
@@ -7878,12 +7892,12 @@ msgstr "Apisańnie: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s choča dasłać tabie fajł:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Niemahčyma nadpisać fajł \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../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."
@@ -7891,22 +7905,22 @@ msgstr ""
 "Fajł z takoj nazvaj užo isnuje, i nie staje pravoŭ dla nadpisańnia hetaha "
 "fajłu."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Hety fajł užo isnuje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Niemahčyma zapisać u kataloh \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie staje pravoŭ dla stvareńnia fajłaŭ u hetym katalohu."
 
@@ -7942,76 +7956,56 @@ msgstr "Fajł: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Nazva:"
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Adpraŭnik:"
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Prypyni"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Praciahni"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajimu patrebny X-server. Vychad..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajimu treba PyGTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajimu treba GTK 2.6 albo paźniejšaj versii. Vychad..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Biblijateka GTK+ nie padtrymvaje libglade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Kali łaska, vydal biblijateku GTK+ i zainstaluj najnoŭšuju stabilnuju "
-"versiju z %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Kali łaska, pravier, ci padtrymvajuć srodki libpango biblijateki GTK+ i "
-"PyGTK."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajimu treba PySQLite2"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8021,11 +8015,11 @@ msgstr ""
 "ściahnuć z %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim užo vykonvajecca"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8068,8 +8062,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "kont"
 
@@ -8091,12 +8085,15 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "adno z: offline, online, chat, away, xa, dnd, invisible "
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "paviedamleńnie"
 
@@ -8335,76 +8332,95 @@ msgstr ""
 "dasłany na ŭsie konty"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Absłuhoŭvaj spasyłki xmpp:/"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "źmiest paviedamleńnia"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Dałučysia da pakoju"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "pakoj"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Pakoj:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "mianuška"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Mianuška nia znojdziena: %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "parol"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Paroli roźniacca"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Kali łaska, pravier, ci pracuje avahi-daemon."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Pakazvaje / chavaje śpis kantaktaŭ"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Nie staje arhumenta \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8413,31 +8429,31 @@ msgstr ""
 "'%s' niama ŭ tvajim śpisie kantaktaŭ.\n"
 "Kali łaska, akreśli kont dla dasyłańnia paviedamleńnia."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Nivodny kont nia dziejny"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Arhumenty:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s nia znojdzieny"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8446,7 +8462,7 @@ msgstr ""
 "Užyvańnie: %s zahad [arhumenty]\n"
 "Zahadam moža być adzin z nastupnych vyrazaŭ:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8455,7 +8471,7 @@ msgstr ""
 "Nadta šmat arhumentaŭ. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8464,7 +8480,11 @@ msgstr ""
 "Arhument \"%s\" nie akreśleny. \n"
 "Vykanaj \"%s help %s\" dla padrabiaźniejšych źviestak"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Niapravilnaja spasyłka"
 
@@ -8494,198 +8514,199 @@ msgstr "Niemahčyma vydalić dziejnuju temu"
 msgid "Please first choose another for your current theme."
 msgstr "Kali łaska, zadziejničaj spačatku inšuju temu."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 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:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Ustaŭ mianušku"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Žurnał razmoŭ"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Złučeńnie"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s vypchnuty z pakoju: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s zablakavany: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ciabie ciapier viedajuć jak %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s ciapier viadomy jak %s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Suviaź: "
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s vyjšaŭ"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dałučyŭsia da pakoju"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 maje ciapier status %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Bolš nie pytajsia"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Źmianiajecca tema"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Kali łaska, vyznač novuju temu:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Źmianiajecca mianuška"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Kali łaska, vyznač dla siabie novuju mianušku:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Apisańnie: %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Vypichvajecca %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Možaš akreślić pryčynu nižej:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Blakavańnie %s"
@@ -8706,59 +8727,59 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Paviedam pra pamyłku"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Padrabiaznaści"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Pamyłka: niemahčyma adčytać %s"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie akreśleny jak zmoŭčany klijent Jabber"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chočaš zrabić Gajim zmoŭčanym klijentam Jabber?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Pašyreńnie nie padtrymvajecca"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Zapišy vyjavu jak..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8768,162 +8789,162 @@ 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:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prymaješ hety zapyt?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Aŭtaryzacyja HTTP (%s) dla %s (id: %s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Niemahvyma dałučycca"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "pamyłka dasyłańnia %s ( %s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Zapyt aŭtaryzacyi"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Aŭtaryzacyja pryniataja"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kantakt \"%s\" anulavaŭ tvaju aŭtaryzacyju"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Anuluj aŭtaryzacyju"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Niemahčyma złučycca z \"%s\""
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Dałučany biez kluča OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Parol niapravilny"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Parol niapravilny"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novaja pošta ŭ skryncy %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8931,7 +8952,7 @@ msgstr[0] "%d novy list"
 msgstr[1] "%d novyja listy"
 msgstr[2] "%d novych listoŭ"
 
-#: ../src/gui_interface.py:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8941,102 +8962,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s choča dasłać tabie fajł."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Vydalaje kantakt sa śpisu"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Pamyłka adčytańnia fajłu:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Dla kožnaha _paviedamleńnia"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Kanflikt imionaŭ karystalnikaŭ"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s choča dasłać tabie fajł."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zapyt na pieradaču fajłu"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9044,15 +9066,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9063,90 +9085,100 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Złučeńnie"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr "Stvarajecca metakantakt. Ty sapraŭdy chočaš praciahnuć?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Šyfravańnie adklučanaje"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Niemahčyma zapisać tvaje nałady i opcyi"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Musiš vyznačyć parol"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vyznač parol GPG dla kontu %s."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ty dałučyśsia da %s biaz OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Niapravilny parol"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
 
@@ -9155,44 +9187,44 @@ msgstr "Kali łaska, vyznač parol GPG znoŭ albo naciśni knopku \"Anuluj\"."
 msgid "_New Group Chat"
 msgstr "Novaja hrupavaja razmova"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Ja chaču dadać ciabie da svajho śpisu kantaktaŭ"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Niemahčyma znajści bazu žurnałaŭ razmoŭ"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kantakty"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Mianuška"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Paviedamleńnie"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9206,27 +9238,27 @@ msgstr ""
 "\n"
 "Kali ty abraŭ \"Tak\", pačakaj..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Ekspartavańnie žurnałaŭ..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Vynikaŭ hetaj aperacyi niemahčyma anulavać."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9266,38 +9298,38 @@ msgstr "Dziejny status: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Dziejny status: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Niemahčyma adčytać vyjavu"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Razmovy"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Pakoji"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Pryvatnyja razmovy"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Paviedamleńni"
 
@@ -9309,22 +9341,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s źmianiŭ status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s dałučyŭsia"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s adłučyŭsia"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Novaje asobnaje paviedamleńnie ad %(nickname)s"
@@ -9349,7 +9381,7 @@ msgstr "Novaje paviedamleńnie ad %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Novaje paviedamleńnie ad %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "dziaviataja"
@@ -9358,12 +9390,12 @@ msgstr "dziaviataja"
 msgid "Retrieving profile..."
 msgstr "Atrymańnie profilu..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "Ściežka da fajłu"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "Takoha pakoju niama."
@@ -9371,7 +9403,7 @@ msgstr "Takoha pakoju niama."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Niemahčyma adčytać vyjavu"
 
@@ -9403,51 +9435,51 @@ msgid ""
 msgstr ""
 "Adbyłasia pamyłka padčas publikacyi asabistych źviestak, pasprabuj paźniej."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Abjadnanyja konty"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Aŭtaryzacyja dasłanaja"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ciapier \"%s\" budzie viedać tvoj status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Zapyt aŭtaryzacyi dasłany"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Aŭtaryzacyja anulavanaja"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, 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:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, 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:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Ty znachodziśsia ŭ adnym ci niekalkich pakojach"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9455,28 +9487,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ty sapraŭdy chočaš pakinuć pakoj \"%s\"?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Anuluj pieradaču fajła"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Jość niečytanyja paviedamleńni"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9485,16 +9528,16 @@ msgstr ""
 "Paviedamleńni možna budzie pračytać paźniej, kali ŭklučana viadzieńnie "
 "žurnałaŭ razmoŭ."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Musiš pračytać ich pierad vydaleńniem hetaha transpartu."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transpart \"%s\" budzie vydaleny"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9502,11 +9545,11 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetym "
 "transpartam."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transparty buduć vydalenyja"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9515,69 +9558,69 @@ msgstr ""
 "Ty bolš nia zmožaš kamunikavać z kantaktami, jakija karystajucca hetymi "
 "transpartami:%s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 #, 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:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Źmiani nazvu kantaktu"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Vyznač novuju mianušku dla kantaktu %s."
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Źmiani nazvu hrupy"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Vyznač novuju nazvu dla hrupy %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Vydal hrupu"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 #, 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Pryznač kluč OpenPGP"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Abiary kluč dla hetaha kantaktu"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kantakt \"%s\" budzie vydaleny z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9586,12 +9629,12 @@ msgstr ""
 "jon zaŭsiody budzie bačyć ciabie adłučanym."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Što chočaš zrabić?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9599,16 +9642,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kantakty buduć vydalenyja z tvajho śpisu kantaktaŭ"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9618,32 +9661,32 @@ msgstr ""
 "ty taksama anuluješ ichnyja aŭtaryzacyi. U vyniku jany zaŭsiody buduć bačyć "
 "ciabie adłučanym."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Konty niedastupnyja"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9652,12 +9695,12 @@ msgstr ""
 "Tvoj server nie padtrymvaje zachoŭvańnia metakantaktaŭ. Tamu hetyja źviestki "
 "nia buduć dastupnyja pry nastupnym złučeńni."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9667,12 +9710,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:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Niapravilny fajł"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9680,12 +9723,12 @@ msgstr[0] "%s choča dasłać tabie fajł:"
 msgstr[1] "%s choča dasłać tabie fajł:"
 msgstr[2] "%s choča dasłać tabie fajł:"
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Dašli %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Zrabi z %s i %s metakantakt"
@@ -9695,134 +9738,138 @@ msgstr "Zrabi z %s i %s metakantakt"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "praz kont %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "da kontu %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "praz kont %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Kiruj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "kontu %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "dla kontu %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "Ź_miani paviedamleńnie statusu"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Абнавіць"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Абнавіць"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Šukaj servisy..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "_Dašli hrupavoje paviedamleńnie"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Usim karystalnikam"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Usim dałučanym karystalnikam"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Źmiani nazvu kantaktu"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Źmiani _hrupy"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Dašli asobnaje paviedamleńnie"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Vykanaj zahad..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transparty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Pakažy _transparty"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "Źmiani _nazvu"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kantakt adłučyŭsia"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kantakt adłučyŭsia"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Kiraŭnik žurnałaŭ"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Dałučysia da pakoju"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Źmiani paviedamleńnie statusu..."
 
@@ -9857,9 +9904,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9872,119 +9919,129 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "Ź_miani paviedamleńnie statusu..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Niama ŭ śpisie kantaktaŭ"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Schavaj hetaje menu"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "JID:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Krynica: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Apošni status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " ad %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "Złučeńnie"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kantakt adłučyŭsia"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Aŭtaryzacyja: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Typ:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Madyfikacyja kontu"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Ściahni"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Zaciahni na server"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Pierasłany: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Nie pačata"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Spyniena"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Zavieršana"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?status pieradačy:Prypyniena"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Zatrymana"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Pieradajecca"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Hety servis dahetul nie adkazaŭ na zapyt padrabiaznych źviestak"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9992,66 +10049,378 @@ msgstr ""
 "Hety servis nia zmoh adkazać na zapyt padrabiaznych źviestak.\n"
 "Servis sastareły albo złamany"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?AS:Nieviadomaja"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Klijent:Nieviadomy"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "ad %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikacyi</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 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:346
+#: ../src/vcard.py:345
 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:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 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:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ty čakaješ adkazu kantaktu na zapyt aŭtaryzacyi"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " krynica z pryjarytetam "
 
+#, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Dałučysia da _pakoju"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Dadaj kantakt..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Šukaj servisy"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Vykanaj zahad..."
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "Madyfikuj kont"
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Asabistyja źviestki"
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "_Pačni razmovu"
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Madyfikacyja kontu"
+
+#~ 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 ""
+#~ "Paznač hetuju opcyju, kali chočaš, kab Gajim złučaŭsia z serveram praz "
+#~ "port 5223, praź jaki staryja servery dajuć mažlivaść vykarystańnia SSL. "
+#~ "Zvažaj: Gajim zvyčajna vykarystoŭvaje šyfravańnie TLS, kali źviartajecca "
+#~ "da servera, a hetaja opcyja adklučaje vykarystańnie TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Źmiani asabistyja źviestki..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Nazva hosta: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Kali ŭklučanaja hetaja opcyja, Gajim budzie zachoŭvać parol u fajle ~/."
+#~ "gajim/config z pravami na čytańnie tolki dla ciabie"
+
+#~ msgid "Port: "
+#~ msgstr "Port: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Zachavaj _parol (niebiaśpiečna)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Dasyłaj pravieračnyja infarmacyjnyja pakiety"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Skarystaj _SSL (zastarełaja opcyja)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Dastasuj da statusu"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Vydal MOTD"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Dašli paviedamleńnie servera"
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Atrymaŭ paviedamleńnie\n"
+#~ "Kantakt adłučyŭsia \n"
+#~ "Kantakt źmianiŭ status \n"
+#~ "Padśvietlenaje paviedamleńnie ŭ hrupavoj razmovie \n"
+#~ "Atrymaŭ hrupavoje paviedamleńnie \n"
+#~ "Zapyt na pieradaču fajłu \n"
+#~ "Pieradača fajłu pačałosia \n"
+#~ "Pieradača fajłu skončyłasia"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kantakt(y)\n"
+#~ "hrupa(y)\n"
+#~ "kožny"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Dałučysia da _pakoju"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "S_kapijuj JID/Email"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "S_kapijuj adras spasyłki"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Adčyni paštovuju prahramu"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Adčyni spasyłku ŭ hartačy"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Pačni razmovu"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Kont\n"
+#~ "Hrupa\n"
+#~ "Kantakt\n"
+#~ "Baner"
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "Źmiani _mianušku"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "Źmiani _temu"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Kanfihuruj _pakoj"
+
+#, fuzzy
+#~ msgid "_Destroy Room"
+#~ msgstr "Apisańnie: %s"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Kiruj zakładkami"
+
+#~ msgid "Send _File"
+#~ msgstr "Vyšli _fajł"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Dadaj u śpis kantaktaŭ"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Dasłać pryvatnaje paviedamleńnie"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Kiruj kontami"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "Vydal"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Dadaje kantakt u śpis kantaktaŭ"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Stvary zakładku dla hetaja pakoju"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Źmiani _mianušku"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "sočyć za razmovaj"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Klikni, kab ustavić smajlik (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Usie stany razmovy\n"
+#~ "Tolki datyčnyja pisańnia\n"
+#~ "Adklučana"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Aŭtamatyčna vyznačać pry kožnym starcie Gajim\n"
+#~ "Zaŭsiody karystacca prahramami, pryznačanymi dla GNOME\n"
+#~ "Zaŭsiody karystacca prahramami, pryznačanymi dla KDE\n"
+#~ "Inšyja"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "niama\n"
+#~ "abiedźvie\n"
+#~ "ad\n"
+#~ "da"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Vydal"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "_Dadaj kantakt..."
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "Zdolnaści serveraŭ"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Pieradačy _fajłaŭ"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil, a_vatar"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Konty"
+
+#~ msgid "_Contents"
+#~ msgstr "_Źmiest"
+
+#~ msgid "_FAQ"
+#~ msgstr "_Častyja pytańni"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Nałady"
+
+#~ msgid "_Quit"
+#~ msgstr "_Skonč pracu"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Dašli _asobnaje aviedamleńnie..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Vyšli _asobnaje paviedamleńnie"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Pakoj"
+
+#~ msgid "Enable"
+#~ msgstr "Ukluč"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Madyfikuj kont..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Niapravilny host"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "Nie staje pysqlite2 (python-pysqlite2) dla vykananaja. Vychad..."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "Biblijateka GTK+ nie padtrymvaje libglade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Kali łaska, vydal biblijateku GTK+ i zainstaluj najnoŭšuju stabilnuju "
+#~ "versiju z %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Kali łaska, pravier, ci padtrymvajuć srodki libpango biblijateki GTK+ i "
+#~ "PyGTK."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajimu treba PySQLite2"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Uvachodnaje paviedamleńnie:"
 
@@ -10246,10 +10615,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "Gajim account %s"
 #~ msgstr "Kont Gajim %s"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Asablivy</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Taki JID užo vykarystoŭvajecca"
 
@@ -10437,9 +10802,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgstr ""
 #~ "Vystaŭlaj paviedamleńnie statusu jak nazvu hranaj _muzyčnaj kampazycyi"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Pakazvaj tolki ŭ śpisie _kantaktaŭ"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Aŭtamatyčnaje paviedamleńnie statusu \"Adyjšoŭ\""
 
@@ -10474,18 +10836,9 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Pašyranaje kiravańnie nahadvańniami..."
 
-#~ msgid "_Never"
-#~ msgstr "_Nikoli"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Paviedam mnie pra heta"
-
 #~ msgid "_Player:"
 #~ msgstr "_Player:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Vynyrni"
-
 #~ msgid "City:"
 #~ msgstr "Horad:"
 
@@ -10665,9 +11018,6 @@ msgstr " krynica z pryjarytetam "
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Рамэа і Джульета</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Старыя казкі"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Маналог"
 
diff --git a/po/bg.po b/po/bg.po
index 6248118bb..ed33bfa72 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -17,59 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Джабър клиент за GTK+"
-
-#: ../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 "Джабър клиент за бързи съобщения"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "_Влизане в стая…"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Добавяне на контакт…"
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Откриване на услуги"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Изпълнение на команда…"
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Промяна на акаунт"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Отваряне на пощенската кутия на Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Лични събития"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Започване на разговор…"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Състояние"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -79,23 +31,23 @@ msgstr ""
 "\n"
 "Изчакайте…"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Изберете една от опциите по-долу:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Попълнете данните за съществуващия ви акаунт</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Изберете сървър</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -103,58 +55,65 @@ msgstr ""
 "Добавяне на този сертификат към списъка с доверени сертификати.\n"
 "Отпечатък тип SHA1 на сертификата:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Използване на удостоверяване"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Свързване при натискане на бутона „Приключване“"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Помощник за създаване на акаунт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "_Вече имам регистриран акаунт, който искам да използвам"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "_Искам да регистрирам нов акаунт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Управление на…"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Няма"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "_Сървър-посредник:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Запазване на паро_ла"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Настройване на профила при свързване"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Използване на нестандартен хост/порт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -162,148 +121,145 @@ msgstr ""
 "Трябва да имате акаунт, за да се свържете с\n"
 "мрежата на Джабър."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "На_преднали"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Приключване"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Хост:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Парола:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "По_рт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "С_ървър:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Разни</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Лични данни</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+msgid "<b>Proxy</b>"
+msgstr "<b>Сървър-посредник</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+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/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Промяна на акаунт"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Акаунти"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Административни операции"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Използване на удостоверяване"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Автоматично свързване при разпадане на връзката"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "С_вързване при стартиране"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Пром_яна на парола"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Изберете тази опция, за да може Gajim да се свързва по порт 5223, където се "
-"очаква сървърите да предоставят възможности по SSL. Забележете, че Gajim "
-"използва шифриране тип TLS по подразбиране и избирайки тази опция, "
-"изключвате TLS."
+"Ако тази опция е избрана, ще се изисква потвърждение преди изпращането на "
+"паролата ви чрез несигурна връзка."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Избор на _ключ…"
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Натиснете, за да смените паролата на акаунта"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Натиснете, за да изискате упълномощаване от всички контакти на друг акаунт"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "С_вързване при стартиране"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Свързване"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Редактиране на личните данни…"
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Е-поща:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Собствено име:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Общи"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Хост: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -311,8 +267,12 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще излъчва повече IP адреси освен вашия "
 "собствен, така че файловият трансфер има повече шансове да работи добре."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Ако тази опция е избрана, паролата ще се взима от агент на GPG като Seahorse."
+
+#: ../data/gui/accounts_window.ui.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -320,16 +280,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изпраща пакети за поддържане на връзката "
 "с цел избягване на разпадането ѝ."
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Ако тази опция е избрана, паролата ще се запази в ~/.gajim/config с права за "
-"четене само за потребителя."
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -337,8 +288,7 @@ msgstr ""
 "Ако тази опция е избрана, при стартиране Gajim ще се свързва автоматично, "
 "използвайки този акаунт."
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -347,47 +297,49 @@ msgstr ""
 "Ако тази опция е избрана, всяка промяна на общото състояние (от списъка в "
 "долната част на главния прозорец) ще променя и състоянието на този акаунт."
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"Ако стандартния порт за входящи съобщения е неудобен за настройките ви, може "
+"да изберете друг тук.\n"
+"Може да помислите и да промените настройките на огнената стена, евентуално."
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Вашите лични данни, както са запазени на сървъра"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Фамилия:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Смесване на акаунти"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Няма"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Лични данни"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Порт: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -397,22 +349,20 @@ msgstr ""
 "събитията от Джабър сървър, когато два или повече клиента са свързани с един "
 "и същ акаунт. Клиентът с най-голям приоритет ще получава събитията."
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Приоритетът ще се сменя автоматично в зависимост от състоянието ви."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Сървър-посредник:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Пре_именуване"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "_Ресурс:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -426,214 +376,100 @@ msgstr ""
 "ресурси „Вкъщи“ и „На работа“ по едно и също време. Ресурсът с най-голям "
 "приоритет ще получава събитията. (вижте по-долу)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Запазване на _паролата (рисковано за сигурността)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Запазване на история на _разговорите за всички контакти"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Изпращане на пакети за поддържане на връзката"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Синхронизиране на контакти"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Използване на _SSL (извън употреба)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Използване на сървъри-посредници за файлови трансфери"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Съгласуване спрямо състоянието"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Име:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Сървър-посредник</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "_Съгласуване спрямо състоянието"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Акаунти"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Използване на удостоверяване"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Ако тази опция е избрана, ще се изисква потвърждение преди изпращането на "
-"паролата ви чрез несигурна връзка."
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "С_вързване при стартиране"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Е-поща:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Собствено име:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Ако тази опция е избрана, паролата ще се взима от агент на GPG като Seahorse."
-
-#: ../data/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Ако стандартния порт за входящи съобщения е неудобен за настройките ви, може "
-"да изберете друг тук.\n"
-"Може да помислите и да промените настройките на огнената стена, евентуално."
-
-#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Фамилия:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Смесване на акаунти"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Пре_именуване"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Изпращане на пакети за поддържане на връзката"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Синхронизиране на контакти"
+
+#: ../data/gui/accounts_window.ui.h:50
 #, fuzzy
 msgid "Use G_PG Agent"
 msgstr "Използване на агент на _GPG"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Използване на нестандартен хост/порт"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Използване на нестандартен порт:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Използване на сървъри-посредници за файлови трансфери"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Редактиране на личните данни…"
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Активиране"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "_Хост:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Управление на…"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "По_рт:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "Предупре_ждаване преди използване на несигурна връзка"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 #, fuzzy
 msgid "_use HTTP__PROXY environment variable"
 msgstr "Използване на променливата на обкръжението „HTTP_PROXY“"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Акаунт:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/gui/add_new_contact_window.ui.h:2
 msgid "A_llow this contact to view my status"
 msgstr "_Позволяване на този контакт да вижда състоянието ми"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Добавяне на нов контакт"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -645,7 +481,7 @@ msgstr ""
 "протокол.  Натиснете бутона „Регистриране“,\n"
 "за да продължите."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -653,411 +489,468 @@ msgstr ""
 "Трябва да сте свързани към транспорта, за да може\n"
 "да добавите контакт от този протокол."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Група:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "Псе_вдоним:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "П_ротокол:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Регистриране"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Възникна грешка:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Изберете команда за изпълнение:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Специални команди - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Проверка наново"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Описание на грешката…"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Изчакайте, докато се извлече списъка с команди…"
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Изчакайте, докато командата се изпраща…"
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Изчакайте…"
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Този Джабър контакт не предлага никакви команди."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Описание</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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, за да влязат в сила някои от "
 "настройките"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Редактор на настройки за напреднали"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Филтър:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Изтриване на MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Изтрива съобщението за деня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "_Филтри за уединение…"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Изпраща съобщение на всички потребители, свързани със сървъра в момента"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Настройване на MOTD…"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Показване на _XML конзола"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Актуализиране на MOTD…"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Актуализиране на съобщението за деня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Администратор"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Изпращане на съобщение от сървъра…"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr " отворен прозорец/подпрозорец с този контакт "
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Действия</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Условия</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Звуци</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Действия за напреднали"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Контрол на уведомления за напреднали"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Всички състояния"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Отсъствам"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Зает "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Невидим"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Изпълнение на команда"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Не съм на разположение"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Едно или повече определени състояния…"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "На линия / Свободен за разговор"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Изпълнение на звук"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"се получава съобщение\n"
-"контактът се изключва \n"
-"контактът сменя състоянието си \n"
-"се осветява съобщение в стая \n"
-"се получава съобщение в стая \n"
-"се получава запитване за файлов трансфер \n"
-"започва файлов трансфер \n"
-"завършва файлов трансфер"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 "_Активиране на подсказката за спешност на мениджъра на прозорци, за да мига "
 "прозореца в панела"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Изключване на автоматичното появяване на прозорец за разговор"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Изключване на съществуващ изскачащ прозорец"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Изключване на съществуващ звук за това събитие"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Изключване на показване на събитието в списъка"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Изключване на показване на събитието в областта за уведомяване"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Информиране с изскачащ прозорец"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Отваряне на прозорец за разговор с потребителя"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "Показване на събитието в спис_ъка"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "Показване на събитието в областта за _уведомяване"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "и аз "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "Контакти"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
-"контакт(и)\n"
-"група/и\n"
-"всички"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "за "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Запис:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Име на емисията:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Последно променена:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Получен е нов запис"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Получихте нов запис:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Блокирани контакти"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Съобщение:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Задаване на дейност"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Задаване на дейност"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Съобщение:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Настроение:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Промяна на парола"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Въведете я отново за потвърждение:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Въведете нова парола:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Напишете новото съобщение за състояние</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Дейност:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Настроение:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Настроени съобщения:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Запазване като настроено…"
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "_Влизане в стая"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "№"
+
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "Копиране на _JID/Е-поща"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Копиране на адреса на връзката"
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Отваряне на пощенската програма"
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Отваряне на връзката в браузър"
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Започване на разговор"
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Изпращане"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "По_кана"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Поканете приятели!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "Сървър за стаи"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Изберете сървър за стаи."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1065,189 +958,187 @@ msgstr ""
 "На път сте да започнете разговор в стая.\n"
 "Изберете контактите, които искате да поканите."
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "_Запитване за виждане на състоянието на контакта"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Добавяне на специално _уведомление…"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Задаване на ключ Open_PGP…"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Изпълнение на команда…"
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Редактиране на _групи…"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "По_кана в"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Покана на _контакти"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "П_ремахване"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Изпращане на _специфично състояние"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Изпращане на _еднократно съобщение…"
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Изпращане на _файл…"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Задаване на друг _аватар…"
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Започване на _разговор"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Превключване на шифриране тип „End to End“"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Превключване на шифриране тип „Open_PGP“"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "Добавяне към _списъка…"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Позволение за виждане на състоянието ми"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Блокиране"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "За_брана за виждане на състоянието ми"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "Ист_ория"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Игнориране"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Управление на контакт"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Преименуване…"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Записване"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Деблокиране"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Премахване на игнорирането"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Попълнете формуляра."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Настройки на стаята"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Редактиране на групи"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(Информация за <b>Е-сесия</b>)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Проверка"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Списък с възможни функционалности на Gajim:</b>"
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Възможности"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Отменя файловия трансфер"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Отменя избрания файлов трансфер"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../data/gui/filetransfers.ui.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Отменя избрания файлов трансфер и изтрива непълния файл"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Из_чистване"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Файлови трансфери"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Скрива прозореца"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Премахване на файловия трансфер от списъка."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Премахва завършилите, прекъснатите или провалени файлови трансфери от списъка"
 
-#: ../data/glade/filetransfers.glade.h:10
+#: ../data/gui/filetransfers.ui.h:10
 msgid "Shows a list of file transfers between you and others"
 msgstr "Показва списък с файловите трансфери между вас и останалите"
 
-#: ../data/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1255,75 +1146,74 @@ msgstr ""
 "Това действие премахва файлов трансфер от списъка. Ако трансферът е активен, "
 "първо се прекъсва и след това се премахва."
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "П_родължаване"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомяване при завършване на файловия трансфер"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Отваряне на папката"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "П_ауза"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "списък с файлови трансфери"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Цветове на подпрозорците</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Ред за акаунт\n"
-"Ред за група\n"
-"Ред за контакт\n"
-"Лента за разговор"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Акаунт"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Получер"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Пише"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Контакт"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Стил на шрифта:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Персонализиране на темите на Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Отсъства"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Група"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Бездеен"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1331,7 +1221,7 @@ msgstr ""
 "Съобщения\n"
 "в стая"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1339,109 +1229,73 @@ msgstr ""
 "Съобщения\n"
 "за стая"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Временно преустановен"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Цвят на текста:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Шрифт на текста:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Фон:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Смяна на псе_вдоним…"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Промяна на _темата…"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Настройки на _стаята…"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Добавяне на стаята към отметките"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Унищожаване на стаята"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Управление на стаята"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Минимизиране при затваряне"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "_Председател"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "_Действия на участника"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Изпращане на _файл"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Добавяне към _списъка…"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Администратор"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Забраняване на достъпа"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Изритване"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Член"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "Со_бственик"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Изпращане на лично съобщение"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Глас"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Създаване на ново съобщение"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "От"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Тема"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1452,25 +1306,19 @@ msgstr ""
 "принцип избягвайте да изтривате история за контакти, с които разговаряте в "
 "момента."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Изтриване"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Изнасяне"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Мениджър на историята на разговорите"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1484,409 +1332,421 @@ msgstr ""
 "Използвайте тази програма за изтриване или изнасяне на дневници. Може да ги "
 "избирате от списъка вляво и/или да търсите в базата от данни по-долу."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Търсене в базата от данни"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Въведете JID или име на контакт\n"
-"История на разговори в стаи\n"
-"История на всички разговори"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Име на контакта"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Стаи"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Търсене:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+msgid "Bro_wse Rooms"
+msgstr "_Търсене"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:4
+#, fuzzy
+msgid "Join this room _automatically when I connect"
 msgstr "Влизане в тази стая автоматично при свързване"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Скоро посетени:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Сървър:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Влизане"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Управление на акаунти"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Автоматично влизане"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Ако тази опция е избрана, ще влизате в тази стая при стартиране."
 
-#: ../data/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Управление на отметките"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Минимизиране при автоматично влизане"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Изписване на състоянията:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Сървър:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Заглавие:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Настройки на услугата PEP"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Настройване"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Настройки</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Настройки</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr ""
 "Свързване по HTTP\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Настройки на сървъра-посредник"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Паро_ла:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Сървър-посредник:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "По_рт:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr ""
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Използване на удостоверяване"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr ""
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Име:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Тип:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "И_ме на потребител:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Добавяне на контакт към списъка (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Разглеждане на историята на разговорите (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Смяна на темата на стаята (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Смяна на псевдоним (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Покана на контакти в разговора (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Изпращане на файл (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Списък с емотикони (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Списък с емотикони (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Меню с функции за напреднали (Ctrl+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Показване на профила на контакта (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Изпращане"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Парола"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Редактор на настройките за напреднали</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Програми</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Действия</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Автоматично състояние</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Изглед на разговорите</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Цветове за разговорите</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Уведомления за състояния на разговора</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Условия</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Персонални</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Шрифт</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Настройки за GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Настроени съобщения за състояние</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Уединение</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Изглед на списъка</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Съобщения за състояние</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Теми</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Презиме:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Зрителни уведомления</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Напреднали"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Напреднали…"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Всички състояния\n"
-"Само при писане\n"
-"Изключено"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Всички състояния"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Позволяване изпращането на _информация за ОС"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Позволяване изпращането на _информация за ОС"
+
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Позволяване на прозорци/уведомления при _Отсъствам/Не съм на разположение/"
 "Зает/Невидим"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Отсъствам"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Питане за съобщение за състояние при преминаване в режим:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
 msgstr ""
-"Автоматично определяне при всяко стартиране на Gajim\n"
-"Винаги да се използват стандартните програми на GNOME\n"
-"Винаги да се използват стандартните програми на KDE\n"
-"Винаги да се използват стандартните програми на Xfce\n"
-"Персонални"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "С_вързване при стартиране"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Съобщение от разговор:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "_Да се проверява дали Gajim е стандартния Джабър клиент при стартиране"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Пише"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Настройване на цвят и шрифт на интерфейса"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Съобщение от разговор:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Име на контакта"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Персонални"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
 msgstr ""
-"Отделен списък и прозорци за разговори\n"
-"Отделен списък и един прозорец за разговори\n"
-"Един прозорец за всичко\n"
-"Отделен списък и разговори, групирани по акаунт\n"
-"Отделен списък и разговори, групирани по вид"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Изключени"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Показване на _дейност на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Показване на _допълнителни данни за е-поща"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Показване на _настроенията на контактите в списъка"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Показване на _слушаната от контактите музика в списъка"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показване на _аватари на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Показване на _настроенията на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Показване на _съобщенията за състояние на контактите в списъка"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1896,7 +1756,7 @@ msgstr ""
 "даден контакт. Тук може да укажете кои състояния бихте искали да се показват "
 "в прозорците за разговор."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1905,7 +1765,7 @@ msgstr ""
 "Gajim може да изпраща и получава мета-информация, свързана с разговора с "
 "даден контакт. Тук може да укажете кои състояния бихте искали да изпращате."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1913,11 +1773,11 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Скриване на всички бутони в прозорците за разговор."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1925,7 +1785,7 @@ msgstr ""
 "Ако тази опция е избрана, контактите ще могат да откриват операционната "
 "система, която използвате."
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1933,14 +1793,14 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще включва информация за подателя на новите "
 "писма."
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Отсъствам“ когато "
 "компютърът не се използва."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1948,7 +1808,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще променя състоянието на „Не съм на "
 "разположение“ когато компютърът не се използва по-дълго време."
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1956,7 +1816,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява аватари на контакти в списъка "
 "и стаите"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1964,28 +1824,36 @@ msgstr ""
 "Ако тази опция е избрана, съобщенията за състояние на контактите ще се "
 "показват под имената им в списъка и в стаите"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява дейността на контактите в "
 "списъка."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
+"списъка."
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява настроението на контактите в "
 "списъка."
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще изобразява слушаната от контактите музика "
 "в списъка."
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1996,7 +1864,7 @@ msgstr ""
 "натискане с десния бутон на мишката в полето за въвеждане, ще се използва "
 "езикът по подразбиране."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -2006,7 +1874,7 @@ msgstr ""
 "неупълномощени контакти. Използвайте я внимателно, тъй като блокира всички "
 "съобщения от всеки контакт, който не е в списъка."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -2016,7 +1884,7 @@ msgstr ""
 "съобщение. Забележете, че при шифриране тип „E2E“ другата страна трябва да "
 "се съгласи, иначе съобщенията няма да бъдат запазвани."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2024,7 +1892,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще показва уведомление при получаването на "
 "ново писмо чрез GMail."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2034,7 +1902,7 @@ msgstr ""
 "състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
 "състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2042,7 +1910,7 @@ msgstr ""
 "Ако тази опция е избрана, няма да се пита за съобщение за състояние — ще се "
 "използва стандартно зададеното."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2050,77 +1918,98 @@ msgstr ""
 "Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
 "съответните анимирани или статични емотикони."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Запазване на дневник на _шифрираната сесия"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "_Компактни прозорци за разговор"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "_Управление…"
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Сървър"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Уведомяване за _включващи се контакти"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Уведомяване за _изключващи се контакти"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Уведомяване за _изключващи се контакти"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Уведомяване при нова поща от _GMail"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Лични събития"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Изпълнение на з_вуци"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
 msgstr ""
-"Показване в изскачащ прозорец\n"
-"Уведомяване\n"
-"Показване само в списъка"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Сървър:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Показване на събитието в спис_ъка"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "Показване на събитието в областта за _уведомяване"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Включване"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2128,27 +2017,27 @@ msgstr ""
 "Някои съобщения могат да включват „rich content“ (форматиране, цветове и т."
 "н.). Ако тази опция е избрана, Gajim ще изобразява само обикновения текст."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Подреждане на контактите по състояние"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Състояние"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "_Набор икони за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Стил"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 #, fuzzy
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
@@ -2159,7 +2048,7 @@ msgstr ""
 "Съобщение за автоматично състояние „Отсъствам“. Ако е празно, няма да се "
 "сменя текущото съобщение."
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/gui/preferences_window.ui.h:111
 #, fuzzy
 msgid ""
 "The auto not available status message. If empty, Gajim will not change the "
@@ -2170,736 +2059,716 @@ msgstr ""
 "Съобщение за автоматично състояние „Не съм на разположение“. Ако е празно, "
 "няма да се сменя текущото съобщение."
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Използване на и_кони за транспортите"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Използване на стан_дартните за системата"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "При получаване на ново събитие:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Грешка: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Псевдоним:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "„_Отсъствам“ след:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "Показване на уведомления при _разговор:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Емотикони:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Файлов мениджър:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Пренебрегване на излишно форматиране на входящите съобщения"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Програма за е-поща:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "„Не съм на _разположение“ след:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Отваряне…"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "Възстановяване на стандартните _цветове"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "Изпращане на уведомления при _разговор:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "С_ъобщение за състояние:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "_Адреси:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Поведение на прозорците:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "в _стаи"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "в с_писъка"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "минути"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Филтри за уединение:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Добавяне / Редактиране на правило</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Списък с правила</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Филтър за уединение</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Активен за тази сесия"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Активен при всяко стартиране"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Всички"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "всички със записване"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Позволяване на"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Отказване"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Ред:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Филтър за уединение"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "всички със записване"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "всички в групата"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"без\n"
-"двустранно\n"
-"от\n"
-"за"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Двустранно"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "От"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "един"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "два"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "да ми изпраща съобщения"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "да ми изпращат лични съобщения"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "да ми изпращат състоянието си"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "да виждат състоянието ми"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Адрес</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Аватар:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Birthday:</b>"
 msgstr "<b>Рожден ден:</b>"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Град:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Фирма:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Държава:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Отдел:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>Е-поща:</b>"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Допълнителен адрес:</b>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Фамилия:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Име</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Собствено:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Страница в Интернет:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Презиме:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Име:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Псевдоним:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Телефон:</b>"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Дейност:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Пощенски код:</b>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Представка:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Роля:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Област/Щат:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Улица:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Наставка:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Относно"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Натиснете, за да настроите аватара си"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: гггг-мм-дд"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Лични данни"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Работа"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Какво искате да направите?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Премахване на акаунт _само от Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Премахване на акаунт от Gajim и от с_ървъра"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Да"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "_Добавяне на контакт…"
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "_Възможности"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Файлови трансфери"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Често задавани въпроси (в Интернет)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Помощ в Интернет"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "_Профил, аватар"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Показване на т_ранспорти"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "П_оказване на списъка"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Акаунти"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Ръководства"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_ЧЗВ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "Помо_щ"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Настройки"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Изход"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Изпращане на _еднократно съобщение…"
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Изглед"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Изчакайте, докато се извлече формуляра за търсене…"
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Търсене"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Добавяне на _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Информация"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Търсене"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Отиване"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Регистриране към"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "От:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Отговор на това съобщение"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Изпращане"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Изпращане на съобщението и затваряне на прозореца"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "До:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Отговор"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Изпра_щане и затваряне"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Упълномощаване"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../data/gui/subscription_request_window.ui.h:2
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Упълномощаване на контакта, така че да знае кога сте свързани"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 "Отказване на упълномощаване на контакт, така че да не знае кога сте свързани"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Искане за записване"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Отказване"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Изберете акаунт, с който искате да синхронизирате"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 msgid "Select the contacts you want to synchronise"
 msgstr "Изберете контактите, които искате да синхронизирате"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Синхронизиране: избор на контакти"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Изключване на звука"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Изпращане на _еднократно съобщение"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Показване на всички _чакащи събития"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "С_ъстояние"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "С_тая"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Запитване:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Клиент:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Област/Щат:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Състояние:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Записване:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Система:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Коментари"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Настроен аватар:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Информация за контакта"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Още"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Аватар:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Шрифт</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Джабър трафик</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Вход в XML формат</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-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"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "I_Q"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Съобщение"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "С_ъстояние"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Промяна на акаунт…"
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Локален JID:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Лични данни"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Състояние:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Джабър клиент за GTK+"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Отмяна на потвърждението"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "На път сте да изпълните команда. Наистина ли искате да я отмените?"
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Услугата изпрати лошо форматирани данни"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Услугата промени идентификатора на сесията."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Услугата върна грешка."
 
@@ -2924,7 +2793,7 @@ msgstr "Число"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Цвят"
 
@@ -3061,88 +2930,88 @@ msgstr "шведски"
 msgid "Chinese (Ch)"
 msgstr "китайски"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Език за проверка на правописа"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/chat_control.py:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "Неопределен"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Болен"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr ""
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Информация за контакта"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Наистина ли да се изпрати файла?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "Шифрирането чрез GPG е включено"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Не е в списъка"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Списък с активни, завършили и прекъснати файлови трансфери"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3150,50 +3019,50 @@ msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщенията с GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "Шифрирането чрез GPG е изключено"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "ЩЕ СЕ запазва дневник за сесията"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "НЯМА да се запазва дневник за сесията"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "е"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "НЕ е"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "Ще"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "НЯМА да"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "и удостоверяването е успешно"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3202,23 +3071,23 @@ msgstr ""
 "Шифрирането чрез %(type)s %(status)s включено %(authenticated)s.\n"
 "%(logged)s се запазва дневник за сесията."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Договорката за сесията отменена"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Тази сесия е шифрирана"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " и ЩЕ СЕ запазва дневник"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " и НЯМА да се запазва дневник"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3226,25 +3095,25 @@ msgstr ""
 "Идентичността на отсрещния контакт не е потвърдена. Натиснете бутона със "
 "щита за повече информация."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "Шифрирането чрез E2E е изключено"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Следното съобщение НЕ БЕШЕ шифрирано"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 msgid "The following message was encrypted"
 msgstr "Следното съобщение беше шифрирано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3252,15 +3121,15 @@ msgstr ""
 "Ако затворите този прозорец и нямате включена опция за запазване на "
 "историята, съобщението ще бъде загубено."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Грешка в базата от данни"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3269,110 +3138,120 @@ msgstr ""
 "Файлът „%s“ от базата от данни не може да бъде прочетен. Опитайте се да го "
 "поправите или изтриете (цялата история ще бъде загубена)."
 
-#: ../src/chat_control.py:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s вече е %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "създаване на база от данни за разговорите"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "създаване на база от данни за разговорите"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s e файл, а би трябвало да е папка"
 
-#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Спиране на програмата"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s e папка, а би трябвало да е файл"
 
-#: ../src/common/check_paths.py:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "създаване на папка %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Промяна на информацията за състоянието"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Промяна на състоянието"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Настройване на съобщението за състояние и описанието му"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "На линия"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Не съм на разположение"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Не ме притеснявайте"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Изключен - изключване"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Описание на състоянието:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Състоянието беше променено."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Излизане от стаите"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s от стая %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Не сте влезли в стая."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr "Изберете стаите, които искате да напуснете"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Стаи"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Напуснахте следните стаи:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Препращане на непрочетени съобщения"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Всички непрочетени съобщения бяха препратени."
 
@@ -3475,9 +3354,9 @@ msgstr ""
 "свиват автоматично."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "по подразбиране"
 
@@ -3764,12 +3643,12 @@ msgstr ""
 "Ако е активирана, ще се показва съобщението за състояние, ако има такова, на "
 "всеки контакт под името му списъка."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Позиция на аватара в списъка.  Може да е ляво (left) или дясно (right)."
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3777,7 +3656,7 @@ msgstr ""
 "Ако е активирана, ще се изпраща запитване за аватар до всеки контакт, който "
 "е нямал такъв последния път или пък има остарял кеширан аватар."
 
-#: ../src/common/config.py:230
+#: ../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."
@@ -3785,7 +3664,7 @@ msgstr ""
 "Ако е изключена, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3799,30 +3678,30 @@ msgstr ""
 "съобщения за състояние. Ако е „in_and_out“, ще се изписва само „Сульо влезе "
 "в стаята“ или „Сульо напусна“."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Цвят на фона на контактите, които се включват."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Цвят на фона на контактите, които се изключват."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ако е активирана, ще се използва по-малък шрифт от стандартния за "
 "възстановените съобщения."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Да не се показва аватара на транспорта."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Да не се показва списъка в панела."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3832,7 +3711,7 @@ msgstr ""
 "прозорецът ще мига (стандартното поведение при повечето мениджъри на "
 "прозорци) при задържане на чакащи събития."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3843,7 +3722,7 @@ msgstr ""
 "информация от тип SHA при присъствие в стаи."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3863,34 +3742,34 @@ msgstr ""
 "„pertype“ — Всеки тип съобщение (т.е. разговор и от стая) се отварят в "
 "специфичен прозорец."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Ако е активирана, натискането на клавиша „Escape“ затваря прозореца/"
 "подпрозореца."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Скрива бутоните в прозорците за разговор."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Скрива лентата в прозореца на стаята"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрива лентата в прозорец за разговор с два контакта"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрива списъка на участниците в прозореца на стаята."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3898,15 +3777,15 @@ msgstr ""
 "В разговор, показва псевдонима в началото на реда само ако не е същия човек, "
 "който е написал предното съобщение."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Отстъп, когато се използва смесване на последователен псевдоним."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавно прелистване на съобщение в прозореца за разговор"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3914,11 +3793,11 @@ msgstr ""
 "Списък с цветове, разделени с „:“, които да се използват за оцветяване на "
 "псевдонимите в стаите."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-TAB отива на следващия подпрозорец, когато всички са прочетени."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3926,7 +3805,7 @@ msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -3935,7 +3814,7 @@ msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -3944,7 +3823,7 @@ msgstr ""
 "Да се показва ли диалогов прозорец за потвърждение при създаване на мета-"
 "контакти? Празен низ означава никога да не се показва диалогов прозорец."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3954,7 +3833,7 @@ msgstr ""
 "прозореца за промяна на акаунти. ВНИМАВАЙТЕ, понеже когато сте свързани с "
 "отрицателен приоритет, НЯМА да получите нито едно съобщение от сървъра."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3962,7 +3841,7 @@ msgstr ""
 "Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
 "keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -3971,7 +3850,7 @@ msgstr ""
 "Ако е активирана, Gajim ще използва набора на ключове на GNOME (gnome-"
 "keyring), ако е достъпен, за да запазва информация за паролите на акаунтите."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3979,7 +3858,7 @@ msgstr ""
 "Ако е активирана, Gajim ще показва броя на включените контакти и общия брой "
 "в редовете за акаунти и групи."
 
-#: ../src/common/config.py:263
+#: ../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"
@@ -3987,7 +3866,7 @@ msgstr ""
 "Може да е празно, „chat“ или „normal“. Ако не е празно, всички входящи "
 "съобщения се третират като от указания тип."
 
-#: ../src/common/config.py:264
+#: ../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."
@@ -3996,7 +3875,7 @@ msgstr ""
 "изпратил последното съобщение, в случай, че прозорецът за разговор не е вече "
 "отворен."
 
-#: ../src/common/config.py:265
+#: ../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."
@@ -4004,13 +3883,13 @@ msgstr ""
 "Ако е активирана, Gajim ще преобразува чрез „dvips“ низа между $$ и $$ в "
 "изображение преди да го вмъкне в прозореца за разговор."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Необходимо време без активност преди прозорецът за промяна на състоянието да "
 "се затвори."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4018,7 +3897,7 @@ msgstr ""
 "Максимален брой редове, които да се показват в разговорите. Най-старите "
 "редове се изчистват."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4026,11 +3905,11 @@ msgstr ""
 "Ако активирана, прозорците за уведомления от „notification-daemon“ ще бъдат "
 "прикрепени към иконата в областта за уведомяване."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Интервал между две проверки за липса на активност."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4038,7 +3917,7 @@ msgstr ""
 "Променете стойността за увеличаване или намаляване размера на изобразените "
 "формули на LaTeX. По-голяма стойност означава по-голям размер."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 #, fuzzy
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
@@ -4047,23 +3926,39 @@ msgstr ""
 "Валидни схеми на адреси. Само схемите в този списък ще бъдат достъпни като "
 "„истински“ адреси."
 
-#: ../src/common/config.py:272
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4071,7 +3966,7 @@ msgstr ""
 "Приоритетът ще се променя автоматично в съответствие със състоянието ви. "
 "Приоритетите се настройват в опциите „autopriority_*“."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4080,38 +3975,38 @@ msgstr ""
 "„xa“, „dnd“ или „invisible“. ЗАБЕЛЕЖКА: Тази опция се използва само ако "
 "„restore_last_status“ е изключена."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Ако е активирана, възстановява се последното използвано състояние."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Ако е изключена, повече няма да виждате аватар в прозореца за разговор."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ако е изключена, не се се подписват съобщенията за състояние с ключ на GPG, "
 "дори и да е конфигуриран."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Активира шифриране тип „ESessions“ за този акаунт."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Дали Gajim да започва шифрирана сесия автоматично, ако е възможно?"
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4119,32 +4014,40 @@ msgstr ""
 "Списък (разделен с шпации) на видове свързвания. Може да съдържа „tls“, "
 "„ssl“ или „plain“."
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Показване на предупреждение преди изпращане на паролата при нешифрирана "
 "връзка."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показване на предупреждение преди използване на стандартната библиотека на "
 "SSL."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Показване на предупреждение преди изпращане на паролата при нешифрирана "
+"връзка."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Списък (разделен с шпации) от грешки на SSL, които да се пренебрегват."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 #, fuzzy
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
@@ -4154,11 +4057,11 @@ msgstr ""
 "връзката, преди да да се опита свързване наново."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Заобикалка заради Jabberd2"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4166,15 +4069,15 @@ msgstr ""
 "Ако тази опция е избрана, ще се използва вашия IP адрес и сървърите-"
 "посредници, указани в опцията file_transfer_proxies, за файлови трансфери."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Отговор на заявки"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Изпратени заявки"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4182,111 +4085,116 @@ msgstr ""
 "Когато се договаря шифрирана сесия, да се приема ли, че искате собствените "
 "съобщения да се запазват в дневник?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Попълнете данните за контакта, който искате да добавите"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Активиран ли е OpenPGP за този контакт?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr "Да се започва ли шифрирана сесия с този контакт, когато е възможно?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Език, за който желаете да се проверяват сгрешените думи."
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "„all“ или състояния, разделени с интервал"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "„yes“, „no“ или „both“"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "„yes“, „no“ или „“"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, така че ми оставете съобщение."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Наслаждавам се на живота навън."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "На линия съм."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Свободен за разговор."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Сега се връщам."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Не съм на разположение."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Не ме притеснявайте."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Довиждане!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4294,98 +4202,90 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "„muc_higlighted_words“ или когато съобщение съдържа псевдонима ви."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук за изпълнение при получаване на каквото и да е съобщение в стая."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "хуманна"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Неуспех при зареждането на модула „idle“"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Грешен хост"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Невалиден локален адрес? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информацията за регистрация за транспорт %s не пристигна навреме"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Регистриране в %s"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Грешка при запис"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Състоянието „Невидим“ не се поддържа."
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Акаунтът „%s“ не поддържа невидимост."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4395,7 +4295,7 @@ msgstr ""
 "поправите (вижте http://trac.gajim.org/wiki/DatabaseBackup) или изтриете "
 "(цялата история ще бъде загубена)."
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Псевдонимът не е позволен: %s"
@@ -4403,78 +4303,78 @@ msgstr "Псевдонимът не е позволен: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Неуспех при влизането в стаята"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вие сте отлъчени от стаята %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Стаята %s не съществува."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Създаването на стаи е ограничено."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Трябва да се използва регистрирания ви псевдоним в стаята %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Не сте в списъка с членове на стаята %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Стаята е била унищожена"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Вместо това може да влезете в тази стая: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
 "roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "вече сме записани за %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "искане за отписване от %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "вече сме отписани от %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4616,27 +4516,27 @@ msgstr "Основната употреба не включва подписва
 msgid "Application verification failure"
 msgstr "Грешка на приложението за проверка"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/common/connection.py:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Нито отдалеченото присъствие е подписано, нито има зададен ключ."
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Това съобщение е *шифрирано* (вижте XEP:„27“)]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4645,80 +4545,80 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Свържете се наново."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Сървърът „%(name)s“ отговори погрешно на запитването за регистрация: %(error)"
 "s"
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сървърът „%s“ предостави различна форма за регистрация"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестна грешка на SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Невалиден отговор"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспортът „%(name)s“ отговори погрешно на запитването за регистрация: %"
 "(error)s"
 
-#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Неуспех при свързване с „%s“"
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Неуспех при свързването със сървъра-посредник"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Неуспех при свързване с акаунт „%s“"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Връзката на акаунт „%s“ се разпадна. Опит за повторно свързване."
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Автентичността на сертификата на %s може да е под въпрос."
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4727,7 +4627,7 @@ msgstr ""
 "\n"
 "Грешка на SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4736,24 +4636,24 @@ msgstr ""
 "\n"
 "Неизвестна грешка на SSL: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Грешка при премахването на списъка за уединение"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4762,45 +4662,45 @@ msgstr ""
 "Списъкът за уединение „%s“ не беше премахнат. Навярно е активен в някой от "
 "свързаните ви ресурси. Изключете го и опитайте отново."
 
-#: ../src/common/connection.py:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Покана на _контакти"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Не е изтеглен, понеже е в състояние „Невидим“"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Транспорти"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Не е в списъка"
 
@@ -4809,39 +4709,53 @@ msgstr "Не е в списъка"
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На този компютър няма инсталиран модул на Питон за D-Bus"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Възможностите за D-Bus не могат да бъдат използвани"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"Липсва зависимостта pysqlite2 (също познато и като python-pysqlite2). "
-"Спиране на програмата…"
+#: ../src/common/dbus_support.py:54
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: system bus not present"
+msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
+
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Неуспех при четенето на базата от данни."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Услугата не е налична: Gajim не е стартиран или „remote_control“ е "
 "„Изключена“"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "На тази машина няма инсталиран D-Bus или липсва модула за Питон"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Липсва „session bus“.\n"
+"Опитайте се да прочетете http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Липсва „session bus“.\n"
 "Опитайте се да прочетете http://trac.gajim.org/wiki/GajimDBus"
@@ -5009,240 +4923,277 @@ msgstr "Края на седмицата"
 msgid "Weekend!"
 msgstr "Събота и неделя!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Невалиден символ в потребителското име."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Необходим е адрес на сървъра."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Невалиден символ в името на хоста."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Невалиден символ в ресурса."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Зает"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Зает"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Не съм на разположение"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Свободен за разговор"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Свободен за разговор"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "На _линия"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "На линия"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Свързване"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Отсъствам"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Изключен"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Изключен"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "Не_видим"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Има грешки"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Двустранно"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Записване"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Не е установен"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Председатели"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Председател"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Участници"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Посетител"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Няма"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Собственик"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Член"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "обръща внимание на разговора"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "прави нещо друго"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 msgid "is composing a message..."
 msgstr "пише съобщение…"
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "спря да пише съобщение"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "затвори прозореца или подпрозореца"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d непрочетено съобщение"
 msgstr[1] "%d непрочетени съобщения"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " от стая %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " от потребител %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d чакащо събитие"
 msgstr[1] "%d чакащи събития"
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Настройки на стаята"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Грешка при изпълнение на „%(command)s“: %(error)s"
@@ -5252,17 +5203,74 @@ msgstr "Грешка при изпълнение на „%(command)s“: %(error
 msgid "%s is not a valid loglevel"
 msgstr "%s не е валидно ниво за дневник"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Стандартно съобщение"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Размер: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "синьозелена"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "мигриране на базата от данни с дневници към индекси"
 
@@ -5899,19 +5907,19 @@ msgstr "Уча"
 msgid "Writing"
 msgstr "Пиша"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Неизвестен изпълнител"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Неизвестно заглавие"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Неизвестен източник"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5921,12 +5929,12 @@ msgstr ""
 "от <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:91
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Неуспех при свързването с порт %s."
 
-#: ../src/common/socks5.py:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5935,7 +5943,7 @@ msgstr ""
 "бъде отменен."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6007,24 +6015,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Грешка при добавянето на услугата. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Изключени"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Стандартно съобщение"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Няма наличен речник за %s език"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6033,220 +6037,220 @@ msgstr ""
 "За да използвате проверката за правопис, трябва да инсталирате %s речник или "
 "да изберете друг език чрез настройването на опцията „speller_language“."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Свързване наново?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако искате всички промени да влязат в сила веднага, трябва да се свържете "
 "наново."
 
-#: ../src/config.py:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Непрочетени събития"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Преди да премахнете този акаунт, прочетете всички чакащи събития."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Имате активни разговори за акаунт „%s“"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всички прозорци за разговори и стаи ще бъдат затворени. Искате ли да "
 "продължите?"
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "За да смените името на акаунта, трябва да прочетете всички чакащи събития."
 
-#: ../src/config.py:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Името на акаунта вече се използва"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "Това име вече се използва от друг акаунт. Изберете друго име."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Преименуване на акаунт"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Въведете ново име за акаунт „%s“"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде във формат „user@server“."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Избор на ключ на OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия ключ на OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Сървърът ви не поддържа визитки"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Сървърът ви не може да запази личната ви информация."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Името на акаунта вече се използва."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Преименувайте го или го премахнете преди да активирате съобщения от/за "
 "локални контакти."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Списък с отлъчени"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Списък с членове"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Списък със собственици"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Списък с администратори"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Псевдоним"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Роля"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Отлъчване…"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6254,11 +6258,11 @@ msgstr ""
 "<b>Кого искате да отлъчите?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Добавяне на член…"
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6266,11 +6270,11 @@ msgstr ""
 "<b>Кого искате да направите член?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Добавяне на собственик…"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6278,11 +6282,11 @@ msgstr ""
 "<b>Кого искате да направите собственик?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Добавяне на администратор…"
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6290,7 +6294,7 @@ msgstr ""
 "<b>Кого искате да направите администратор?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6307,87 +6311,115 @@ msgstr ""
 "4. домейн (домейна съвпада, както и всеки потребител@домейн,\n"
 "домейн/ресурс или адрес, съдържащ под-домейн."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт „%s“"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Емотиконите са изключени"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Неуспех при свързването със сървъра-посредник"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Какво искате да направите?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Премахване на акаунт _само от Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "По подразбиране"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "Всички"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Само влизащи и излизащи"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "Без"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Нова стая"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Псевдонимът не е позволен: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Невалиден сървър"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6397,33 +6429,33 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Задайте сървър, където искате да се регистрирате."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Сертификатът вече е във файла"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Този сертификат вече е във файла „%s“, така че няма да бъде добавен наново."
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6438,7 +6470,7 @@ msgstr ""
 "Грешка на SSL: %(error)s\n"
 "Все още ли искате да се свържете с този сървър?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6449,59 +6481,59 @@ msgstr ""
 "Отпечатък тип SHA1 на сертификата:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Първо получено съобщение"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Следващо получено съобщение в прозорец на фокус"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Следващо получено съобщение в прозорец без фокус"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Включване на контакт"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Изключване на контакт"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Изпратено съобщение"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Осветено съобщение в стая"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Получено съобщение в стая"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Получена поща от Gmail"
 
@@ -6523,45 +6555,45 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто\n"
 "за последен път сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Изход"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия за „%s“"
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в адреса за търсене"
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Отваряне като _връзка"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6569,7 +6601,7 @@ msgstr[0] "Вчера"
 msgstr[1] "Вчера"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -6676,68 +6708,68 @@ msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Невалиден идентификатор"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Потребителският идентификатор не трябва да съдържа ресурс."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Не може да добавите себе си към списъка."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Контактът вече е в списъка"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Контактът вече съществува в списъка."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Идентификатор на потребител:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Джабър клиент за GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Версия на GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Версия на PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Текущи разработчици:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Бивши разработчици:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@gnu.org>\n"
@@ -6746,7 +6778,7 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6759,102 +6791,102 @@ msgstr ""
 "\n"
 "Функционалността за осветяване на сгрешени думи ще е изключена"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Псевдонимът съдържа непозволени знаци."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Искане за записване за акаунт „%(account)s“ от %(jid)s"
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Акаунт, от който искате да влезете в стаята"
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Невалиден псевдоним"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Невалиден Jabber ID на стая"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID на стаята съдържа непозволени знаци."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Това не е стая"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не е име на стая."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Трябва да сте свързани, за да синхронизирате контактите си."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Този акаунт не е свързан към сървъра"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не може да се синхронизирате с акаунт, ако не е свързан."
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Синхронизиране"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6863,173 +6895,171 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Невалиден JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Неуспех при анализирането на „%s“."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Ново съобщение"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Ново лично съобщение"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Нова е-поща"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Покана за разговор в стая"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Контактът промени състоянието си"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Еднократно съобщение за акаунт „%s“"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML конзола"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Тъжен"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Унил"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "П_ремахване"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7037,157 +7067,157 @@ msgid ""
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "Унил"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Изтриване"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Група"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Добавяне на _контакт"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Филтър за уединение <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Филтър за уединение за %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ред: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редактиране на правило</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавяне на правило</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Филтри за уединение за %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Филтри за уединение"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Невалидно име на филтър"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Трябва да въведете име, за да се създаде филтър за уединение."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Поканени сте в стая."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ви покани да се присъедините към дискусия"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact ви покани в стая %(room_jid)s."
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Искате ли да приемете поканата?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когато %s стане:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавяне на специално уведомление за %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "№"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "когато съм "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7198,19 +7228,19 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ (SAS) на сесията е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Вече се проверили идентичността на този контакт."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Идентичността на контакта проверена"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Проверка наново…"
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7220,19 +7250,19 @@ msgstr ""
 "съобщения или да ви изпраща такива, е необходимо да проверите идентичността "
 "му като натиснете бутона по-долу."
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Идентичността на контакта НЕ Е проверена"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Проверка…"
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Проверихте ли идентичността на контакта?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7247,22 +7277,22 @@ msgstr ""
 "\n"
 "Краткият удостоверителен низ на тази сесия е <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Говорихте ли с отдалечение контакт за проверка на SAS?"
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7271,7 +7301,7 @@ msgstr ""
 "така че съобщенията <b>не могат</b> да се шифрират. За да се доверите на "
 "този ключ, използвайте клиент на GPG."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7279,52 +7309,52 @@ msgstr ""
 "Има зададен ключ на GPG за този контакт и вие му се доверявате, така че "
 "съобщенията ще бъдат шифрирани."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Други"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Стаи за разговор"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Услугата не може да бъде намерена"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7332,93 +7362,97 @@ msgstr ""
 "Няма услуга на въведения адрес или не отговаря. Проверете адреса и опитайте "
 "отново."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Услугата не е достъпна"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Този вид услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Невалидно име на сървър"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Търсене в %(address)s от акаунт „%(account)s“"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Търсене"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Изпълнение на команда"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Сканиране на %(current)d / %(total)d…"
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Идентификатор"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Добавяне на стаята към отметките"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Отметката вече е установена"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Стаята „%s“ вече присъства в отметките."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Отметката беше добавена успешно"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
-#: ../src/disco.py:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Записан"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Възел"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Ново съобщение"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Отписване"
 
@@ -7471,7 +7505,7 @@ msgstr "Изисква python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7645,104 +7679,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Изисква python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-"Възможност за натискане с мишката върху адреси в заглавните части на "
-"прозорците."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Изисква python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Изисква python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Функционалност"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Файл:"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Време"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Напредък"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Име на файл: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Вие"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Получател: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Запазен в: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Файловият трансфер завърши"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Отваряне на папката"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Файловият трансфер е прекъснат"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "Не може да бъде установен контакт с отсрещната машина."
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получател: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Грешка: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Файловият трансфер е преустановен"
@@ -7751,7 +7771,7 @@ msgstr "Файловият трансфер е преустановен"
 msgid "Choose File to Send..."
 msgstr "Избор на файл за изпращане…"
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Описание: "
 
@@ -7783,33 +7803,33 @@ msgstr "Описание: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Неуспех при презаписването на съществуващия файл „%s“"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Вече съществува файл с това име и нямате права да го презапишете."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Този файл вече съществува"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папката „%s“ не е разрешена за запис"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Нямата права да създавате файлове в тази папка."
 
@@ -7845,76 +7865,56 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Изпращач: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "П_родължаване"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Необходим е X сървър. Спиране на програмата…"
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim изисква PyGTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim изисква PyGTK 2.8 или по-нова версия. Спиране на програмата…"
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim изисква GTK 2.8 или по-нова версия"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim изисква GTK 2.8 или по-нова версия. Спиране на програмата…"
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Липсва поддръжка на libglade за библиотеката GTK+"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Премахнете текущата версия на библиотеката GTK+ и инсталирайте последната "
-"стабилна от %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
-"libglade."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim изисква PySQLite2"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim изисква pywin32"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7923,11 +7923,11 @@ msgstr ""
 "Уверете се, че Pywin32 е инсталиран на системата. Може да го изтеглите от %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim вече е стартиран"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7970,8 +7970,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "акаунт"
 
@@ -7993,7 +7993,10 @@ msgid "status"
 msgstr "състояние"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "едно от: offline (изключен), online (на линия), chat (свободен за разговор), "
 "away (отсъствам), xa (не съм на разположение), dnd (зает), invisible "
@@ -8001,7 +8004,7 @@ 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:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "съобщение"
 
@@ -8242,71 +8245,90 @@ 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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработка на адрес тип xmpp://"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "адрес"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "Адрес за обработка"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr "Акаунт, за който искате да го обработите"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "текст на съобщението"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Влизане в стая"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "стая"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID на стая"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "псевдоним"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Псевдоним"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "парола"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Парола за влизане в стаята"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr "Акаунт, от който искате да влезете в стаята"
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Проверка дали Gajim е стартиран"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Показва или скрива прозореца на IPython"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8315,16 +8337,16 @@ msgstr ""
 "„%s“ не е в списъка ви.\n"
 "Укажете акаунт за изпращането на това съобщение."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Нямате активен акаунт"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Изглежда Gajim не е стартиран, така че не може да ползвате gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8333,16 +8355,16 @@ msgstr ""
 "Употреба: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s не е намерен"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8351,7 +8373,7 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8360,7 +8382,7 @@ msgstr ""
 "Твърде много аргументи. \n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8369,7 +8391,11 @@ msgstr ""
 "Не е указан аргумент „%(arg)s“.\n"
 "Напишете „%(basename)s help %(command)s“ за повече информация"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Грешен адрес"
 
@@ -8398,173 +8424,174 @@ msgstr "Не може да изтриете текущата тема"
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на лично съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Въведете псевдоним"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Разговор с "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Продължен разговор"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "На всеки участник е позволено да вижда вашия JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Беше създадена нова стая"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сървърът назначи или промени псевдонима ви в стаята"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s вече е познат като %(new_nick)s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s беше изритан от стаята (%(reason)s)"
 
-#: ../src/groupchat_control.py:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "рангът е променен"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "Конфигурацията на стаята бе променена на „само за членове“"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "Изключване на системата"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Рангът на %(nick)s бе зададен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Ролята на %(nick)s бе зададена на %(role)s"
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s влезе в стаята"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 вече е %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1690
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
 
-#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "Да _не се задава този въпрос отново"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Промяна на темата"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Въведете новата тема:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Промяна на псевдонима"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Въведете новия псевдоним, който искате да използвате:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Унищожаване на %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8572,22 +8599,22 @@ msgstr ""
 "Определено сте на път да унищожите тази стая.\n"
 "Може да укажете причина по-долу:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Може да въведете и друго място за срещи:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Отлъчване на %s"
@@ -8607,63 +8634,63 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Докладване на грешка"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Подробности"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не е стандартния Джабър клиент"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Искате ли Gajim да бъде стандартния Джабър клиент?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Винаги да се проверява дали Gajim е стандартния Джабър клиент при всяко "
 "стартиране"
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Разширението не се поддържа"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Запазване на изображението като…"
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8674,59 +8701,59 @@ msgstr ""
 "участник.\n"
 "Укажете друг псевдоним по-долу:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Приемате ли това запитване за акаунт %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Упълномощаване по HTTP (%(method)s) за „%(url)s“ (id: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Неуспех при свързването"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка при изпращане на %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Искане за записване"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gui_interface.py:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8734,62 +8761,62 @@ msgstr ""
 "Винаги ще го виждате като изключен.\n"
 "Искате ли да го премахнете от списъка с контакти?"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Отписване"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Неуспех при установяването на контакт с „%s“"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s зададе темата на %(subject)s"
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Стаята показва отсъстващ член"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "Стаята не показва отсъстващи членове"
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Воденето на дневник на стаята е включено"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Воденето на дневник на стаята е изключено"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Стаята не е анонимна"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Стаята е полу-анонимна"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Стаята е напълно анонимна"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Необходима е парола за влизане в стаята „%s“. Въведете я."
 
-#: ../src/gui_interface.py:1137
+#: ../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"
@@ -8797,25 +8824,25 @@ msgstr ""
 "Конфигурирали сте Gajim да използва агент на GPG, но такъв не е стартиран "
 "или е предоставил грешна парола.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG не е използваем"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 #, fuzzy
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
@@ -8824,28 +8851,28 @@ msgstr ""
 "Няма зададен ключ на GPG за този контакт, така че не може да шифрирате "
 "съобщения."
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 "Наборът с ключове на GNOME е инсталиран, но не е стартиран правилно (навярно "
 "променливата на обкръжението не е настроена)"
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ново писмо за %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8860,44 +8887,44 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Премахване на контакт от списъка"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1454
+#: ../src/gui_interface.py:1479
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/gui_interface.py:1467
+#: ../src/gui_interface.py:1492
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1471
+#: ../src/gui_interface.py:1496
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/gui_interface.py:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8906,56 +8933,57 @@ msgstr ""
 "Неуспех при дешифрирането на съобщение от %s\n"
 "Възможно е да е било фалшифицирано."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Неуспех при дешифриране на съобщението"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Конфликт с имената на потребители"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Укажете ново потребителско име за локалния ви акаунт"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s сек)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Грешка."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Конфликт на ресурсите"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Вече сте свързани към този акаунт със същия ресурс. Въведете нов."
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при проверка на сертификата на SSL"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8966,15 +8994,15 @@ msgstr ""
 "(error)s\n"
 "Все още ли искате да се свържете със сървъра?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Пренебрегване на грешката за този сертификат."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Грешка в сертификата на SSL"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, fuzzy, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8990,23 +9018,28 @@ msgstr ""
 "\n"
 "Все още ли искате да се свържете и да обновите отпечатъка на сертификата?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Несигурна връзка"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, наистина искам да се свържа по несигурен начин"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -9015,27 +9048,36 @@ msgstr ""
 "инсталирате PyOpenSSL, за да предотвратите това. Сигурни ли сте, че искате "
 "да го направите?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+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"
 msgstr "Възелът на PEP не беше премахнат"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Възелът на PEP %(node)s не беше премахнат: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Емотиконите са изключени"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Темата с емотикони не беше намерена, така че са изключени."
 
-#: ../src/gui_interface.py:2570
+#: ../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 "
@@ -9045,41 +9087,41 @@ msgstr ""
 "формата на файла emoticons.py. Вижте http://trac.gajim.org/wiki/Emoticons за "
 "повече подробности."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Въведете парола за ключ на GPG %(keyid)s (акаунт „%(account)s“)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Няма зададен ключ на GPG"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Грешна парола"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Въведете паролата за GPG ключа наново или натиснете „Отказване“."
 
@@ -9087,39 +9129,39 @@ msgstr "Въведете паролата за GPG ключа наново ил�
 msgid "_New Group Chat"
 msgstr "_Нова стая"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Неуспех при откриването на базата от данни за разговорите"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Контакти"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Псевдоним"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Съобщение"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9127,7 +9169,7 @@ msgstr ""
 "Искате ли да изчистите базата от данни? (ИЗОБЩО НЕ СЕ ПРЕПОРЪЧВА АКО GAJIM Е "
 "СТАРТИРАН)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9141,26 +9183,26 @@ msgstr ""
 "\n"
 "В случай, че изберете „Да“, изчакайте…"
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Изнасяне на записите на разговорите…"
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s каза в %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Това е необратима операция."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Наистина ли искате да изтриете избраното съобщение?"
@@ -9200,37 +9242,37 @@ msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Изтече времето за зареждане на изображението"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Изображението е твърде голямо"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Наистина ли искате да изтриете избраното съобщение?"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Стаи"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Лични разговори"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Съобщения"
 
@@ -9242,22 +9284,22 @@ msgstr "— ще бъде воден дневник за съобщенията"
 msgid "- messages will not be logged"
 msgstr "— няма да бъде воден дневник за съобщенията"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s промени състоянието си"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s се включи"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s се изключи"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ново еднократно съобщение от %(nickname)s"
@@ -9282,7 +9324,7 @@ msgstr "Съобщение от %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Ново съобщение от %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "_Игнориране"
@@ -9291,18 +9333,18 @@ msgstr "_Игнориране"
 msgid "Retrieving profile..."
 msgstr "Извличане на профила…"
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Файлът не съдържа нищо"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Файлът не съществува"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Неуспех при зареждането на изображението"
 
@@ -9333,51 +9375,51 @@ msgid ""
 msgstr ""
 "Възникна грешка при публикуване на личните данни, опитайте отново по-късно."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG не е използваем"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9385,28 +9427,39 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "без синхронизация"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Отменя файловия трансфер"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9414,16 +9467,16 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята и контактът е в списъка."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Трябва да ги прочетете преди да премахнете този транспорт."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9431,11 +9484,11 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Ще бъдат премахнати транспорти"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9444,70 +9497,70 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "тези транспорти: %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Преименуване на контакт"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Въведете нов псевдоним за контакт „%s“"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Преименуване на група"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Въведете ново име за група „%s“"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Премахване на група"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Искате ли да премахнете групата „%s“ от списъка?"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Премахване от списъка и на всички контакти в тази група"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9516,11 +9569,11 @@ msgstr ""
 "ще ви вижда изключен."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Искате ли да продължите?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9528,16 +9581,16 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Ще бъдат премахнати контакти от списъка"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9546,35 +9599,35 @@ msgstr ""
 "Премахвайки тези контакти: %s\n"
 "прекратявате и упълномощаването, така че винаги ще ви виждат изключен(а)."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Джабър акаунт."
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сървърът ви няма поддръжка за мета-контакти"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9582,14 +9635,14 @@ msgstr ""
 "Вашият сървър не поддържа съхраняването на информация за мета-контакти, така "
 "че тази информация няма да се запази при следващото свързване."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "На път сте да създадете мета-контакт. Сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../src/roster_window.py:3986
+#: ../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 "
@@ -9599,23 +9652,23 @@ msgstr ""
 "Основно се използва, когато един и същ потребител има няколко акаунта за "
 "Джабър или акаунти за транспорти."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Невалиден адрес на файл:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Изпращане на %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Изпращане на файл до контакт"
@@ -9625,127 +9678,131 @@ msgstr "Изпращане на файл до контакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Управление на отметките…"
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Публикуване на мелодия"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Публикуване на мелодия"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Настройване на услуги…"
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Максимизиране на всички"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "_Изпращане на групово съобщение"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "До всички потребители"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "До всички включени потребители"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Управление на контакти"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Изпращане на еднократно съобщение"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Изпълнение на команда…"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "Управление на _транспорт"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "Промяна на т_ранспорт"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Преименуване"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Максимизиране"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Изключване"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Изключване"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Мениджър на историята"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Влизане в нова стая"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние…"
 
@@ -9776,13 +9833,13 @@ msgid "Confirm these session options"
 msgstr "Потвърждение на тези настройки на сесията"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Отдалеченият клиент иска да договори сесия с тези параметри:\n"
 "\n"
@@ -9805,116 +9862,126 @@ msgstr ""
 "\n"
 "Продължаване с тази сесия?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние…"
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "в с_писъка"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Скриване на това меню"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s на тази стая"
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [минимизиран]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Състояние: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Последно състояние: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " от %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Свързан"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Изключен"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Записване: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Песен:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Уведомления"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Завършил"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "Временно прекъснат"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9922,29 +9989,29 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е извън употреба или повредена"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "от %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9952,7 +10019,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9960,13 +10027,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9974,18 +10041,375 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Няма чакащо запитване за записване."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "_Влизане в стая…"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Добавяне на контакт…"
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Откриване на услуги"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Изпълнение на команда…"
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Промяна на акаунт"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Лични събития"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Започване на разговор…"
+
+#~ msgid "_Status"
+#~ msgstr "_Състояние"
+
+#~ msgid "Account Modification"
+#~ msgstr "Промяна на акаунт"
+
+#~ msgid ""
+#~ "Check this so Gajim will connect in port 5223 where legacy servers are "
+#~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+#~ "default if broadcasted by the server, and with this option enabled TLS "
+#~ "will be disabled"
+#~ msgstr ""
+#~ "Изберете тази опция, за да може Gajim да се свързва по порт 5223, където "
+#~ "се очаква сървърите да предоставят възможности по SSL. Забележете, че "
+#~ "Gajim използва шифриране тип TLS по подразбиране и избирайки тази опция, "
+#~ "изключвате TLS."
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Редактиране на личните данни…"
+
+#~ msgid "Hostname: "
+#~ msgstr "Хост: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Ако тази опция е избрана, паролата ще се запази в ~/.gajim/config с права "
+#~ "за четене само за потребителя."
+
+#~ msgid "Port: "
+#~ msgstr "Порт: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Сървър-посредник:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Запазване на _паролата (рисковано за сигурността)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Изпращане на пакети за поддържане на връзката"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Използване на _SSL (извън употреба)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Съгласуване спрямо състоянието"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Изтриване на MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Изпращане на съобщение от сървъра…"
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "се получава съобщение\n"
+#~ "контактът се изключва \n"
+#~ "контактът сменя състоянието си \n"
+#~ "се осветява съобщение в стая \n"
+#~ "се получава съобщение в стая \n"
+#~ "се получава запитване за файлов трансфер \n"
+#~ "започва файлов трансфер \n"
+#~ "завършва файлов трансфер"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "контакт(и)\n"
+#~ "група/и\n"
+#~ "всички"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Влизане в стая"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "Копиране на _JID/Е-поща"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Копиране на адреса на връзката"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Отваряне на пощенската програма"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Отваряне на връзката в браузър"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Започване на разговор"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Ред за акаунт\n"
+#~ "Ред за група\n"
+#~ "Ред за контакт\n"
+#~ "Лента за разговор"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Смяна на псе_вдоним…"
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Промяна на _темата…"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Настройки на _стаята…"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Унищожаване на стаята"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Управление на стаята"
+
+#~ msgid "Send _File"
+#~ msgstr "Изпращане на _файл"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Добавяне към _списъка…"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Изпращане на лично съобщение"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Въведете JID или име на контакт\n"
+#~ "История на разговори в стаи\n"
+#~ "История на всички разговори"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Управление на акаунти"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Добавяне на контакт към списъка (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Добавяне на стаята към отметките (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Разглеждане на историята на разговорите (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Смяна на темата на стаята (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Смяна на псевдоним (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Покана на контакти в разговора (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Изпращане на файл (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Списък с емотикони (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Списък с емотикони (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Меню с функции за напреднали (Ctrl+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Показване на профила на контакта (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Всички състояния\n"
+#~ "Само при писане\n"
+#~ "Изключено"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Автоматично определяне при всяко стартиране на Gajim\n"
+#~ "Винаги да се използват стандартните програми на GNOME\n"
+#~ "Винаги да се използват стандартните програми на KDE\n"
+#~ "Винаги да се използват стандартните програми на Xfce\n"
+#~ "Персонални"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Отделен списък и прозорци за разговори\n"
+#~ "Отделен списък и един прозорец за разговори\n"
+#~ "Един прозорец за всичко\n"
+#~ "Отделен списък и разговори, групирани по акаунт\n"
+#~ "Отделен списък и разговори, групирани по вид"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Показване в изскачащ прозорец\n"
+#~ "Уведомяване\n"
+#~ "Показване само в списъка"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "без\n"
+#~ "двустранно\n"
+#~ "от\n"
+#~ "за"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-close"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "_Добавяне на контакт…"
+
+#~ msgid "Fea_tures"
+#~ msgstr "_Възможности"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Файлови трансфери"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "_Профил, аватар"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Акаунти"
+
+#~ msgid "_Contents"
+#~ msgstr "_Ръководства"
+
+#~ msgid "_FAQ"
+#~ msgstr "_ЧЗВ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Настройки"
+
+#~ msgid "_Quit"
+#~ msgstr "_Изход"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Изпращане на _еднократно съобщение…"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Изпращане на _еднократно съобщение"
+
+#~ msgid "Sta_tus"
+#~ msgstr "С_ъстояние"
+
+#~ msgid "_Group Chat"
+#~ msgstr "С_тая"
+
+#~ msgid "Enable"
+#~ msgstr "Активиране"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Промяна на акаунт…"
+
+#~ msgid "Wrong host"
+#~ msgstr "Грешен хост"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Невалиден локален адрес? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr ""
+#~ "Липсва зависимостта pysqlite2 (също познато и като python-pysqlite2). "
+#~ "Спиране на програмата…"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Възможност за натискане с мишката върху адреси в заглавните части на "
+#~ "прозорците."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Изисква python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "Липсва поддръжка на libglade за библиотеката GTK+"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Премахнете текущата версия на библиотеката GTK+ и инсталирайте последната "
+#~ "стабилна от %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Уверете се, че версиите на GTK+ и PyGTK на системата ви имат поддръжка за "
+#~ "libglade."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim изисква PySQLite2"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "В_ходящо съобщение:"
 
@@ -10204,9 +10628,6 @@ msgstr " ресурс с приоритет "
 #~ msgid "Gajim account %s"
 #~ msgstr "Акаунт „%s“"
 
-#~ msgid "Custom"
-#~ msgstr "Персонални"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Дублиран Jabber ID"
 
diff --git a/po/br.po b/po/br.po
index 97e34d828..720b9c4f9 100644
--- a/po/br.po
+++ b/po/br.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2006-06-05 19:14+0100\n"
 "Last-Translator: Giulia Fraboulet <djoulia_at_gmail.com>\n"
 "Language-Team: \n"
@@ -22,64 +22,12 @@ msgstr ""
 "X-Poedit-Language: French\n"
 "X-Poedit-Country: FRANCE\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Ur flaperez Jabber e GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
-msgid "Join _Group Chat..."
-msgstr "Ebarzhiñ ur _webgaoz"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Ouzhpennañ un darempred..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Dizoleiñ ar servijoù"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr ""
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "_Kemmañ ar gont..."
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Digeriñ ar bostelerez"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Titouroù hiniennel"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Kregiñ da flapiñ"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Stad"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -90,84 +38,91 @@ msgstr ""
 "\n"
 "Gortozit marplij..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Diuzit unan eus an dibaboù dindan :</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Leuniit an titouroù evit ho kont nevez</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Implij an diskleriañ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Kevreañ pa bouezan war Echuiñ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Bez em eus ur gont a fell din implij"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Fellout a ra din emezelañ evit krouiñ ur gont"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 ""
 "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Kemmañ..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Hini ebet"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proksi:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Enrollañ ar _ger-kuzh"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Aozañ ma aelad pa lugan"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Implij un anv ostiz/porzh personelaet"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -175,150 +130,147 @@ msgstr ""
 "Rankout a rit kaout ur gont evit en em lugañ\n"
 "d'ar rouedad Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Mont pelloc'h"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Echuiñ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Servijer:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Ger-kuzh:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Porzh:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Servijer:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../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/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Titouroù hiniennel</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Perzhioù</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Goulenn evit gwelet e/he stad"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Kont"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Kemmañ ar gont"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Kontoù"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Roll ar verourien"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Implij an diskleriañ"
+
+#: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Adkevreañ war-eeun pa vez kollet ar gevreadenn"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_evreañ en ur loc'hañ Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "C_heñch ar ger-kuzh"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Si vous cochez cette case, Gajim se connectera sur le port 5223, sur lequel "
-"les serveurs sont supposés gérer le SSL. Notez que Gajim utilise le cryptage "
-"TLS par défaut si le serveur annonce qu'il le supporte, et avec cette option "
-"vous désactivez le TLS"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Dibabit un _alc'hwezh..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Klikit evit cheñch ger-kuzh ar gont"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "K_evreañ en ur loc'hañ Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Kevreadenn"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Kemmañ an titouroù hiniennel..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Postel:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+#, fuzzy
+msgid "First Name:"
+msgstr "Anv:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Hollek"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Servijer:"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../data/gui/accounts_window.ui.h:23
 #, fuzzy
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
@@ -327,8 +279,13 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, 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:26
 #, fuzzy
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
@@ -337,16 +294,7 @@ 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/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Si cette case est cochée, Gajim va sauvegarder le mot de passe dans ~/.gajim/"
-"config avec accès en lecture pour vous uniquement"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -354,8 +302,7 @@ msgstr ""
 "M'eo diuzet, ec'h emlugo Gajim da jabber en ur implij ar gont-mañ en ur "
 "loc'hañ"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -364,69 +311,68 @@ 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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Titouroù diwar ho penn, miret war ar servijer"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 "ID Jabber:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+#, fuzzy
+msgid "Last Name:"
+msgstr "Anv:"
+
+#: ../data/gui/accounts_window.ui.h:34
+#, fuzzy
+msgid "Mer_ge accounts"
+msgstr "_Strollañ ar c'hontoù"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Alc'hwez ebet diuzet"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Hini ebet"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Titouroù hiniennel"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Porzh:"
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 ""
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proksi:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "_Adenvel"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -435,215 +381,100 @@ msgid ""
 "has the highest priority will get the events. (see below)"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "_Enrollañ ar ger-kuzh (diasur)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Enrollaén an _istoradur-flapiñ evit an holl zarempredoù"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Diskouez an darempredoù _ezlinenn"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Implij _SSL"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Implij ar proksioù evit treuzkas restroù"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr ""
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-#, fuzzy
-msgid "_Name:"
-msgstr "_Anv:"
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Perzhioù</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "Goulenn evit gwelet e/he stad"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Kontoù"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Implij an diskleriañ"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "K_evreañ en ur loc'hañ Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Postel:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#, fuzzy
-msgid "First Name:"
-msgstr "Anv:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, 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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
+#: ../data/gui/accounts_window.ui.h:48
+msgid "Synchroni_ze account status with global status"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "ID Jabber:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#, fuzzy
-msgid "Last Name:"
-msgstr "Anv:"
-
-#: ../data/glade/accounts_window.glade.h:34
-#, fuzzy
-msgid "Mer_ge accounts"
-msgstr "_Strollañ ar c'hontoù"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "_Adenvel"
-
-#: ../data/glade/accounts_window.glade.h:47
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
 #, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
-
-#: ../data/glade/accounts_window.glade.h:49
-msgid "Synchroni_ze account status with global status"
-msgstr ""
+msgid "Synchronise contacts"
+msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Implij un anv ostiz/porzh personelaet"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Implij un anv ostiz/porzh personelaet"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Implij ar proksioù evit treuzkas restroù"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Kemmañ an titouroù hiniennel..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Enaouiñ"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Servijer:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Kemmañ..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Porzh:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 #, fuzzy
 msgid "A_ccount:"
 msgstr "Kont"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Ouzhpennañ un darempred nevez"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -651,650 +482,715 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Strollad:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Lesanv:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protokol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 #, fuzzy
 msgid "_Register"
 msgstr "_Emezelañ"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../data/gui/add_new_contact_window.ui.h:15
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Koumanant"
+
+#: ../data/gui/add_new_contact_window.ui.h:16
 #, fuzzy
 msgid "_User ID:"
 msgstr "ID arveriad-ez:"
 
-#: ../data/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 #, fuzzy
 msgid "<b>An error has occurred:</b>"
 msgstr "Une erreur de protocole s'est produite :"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
 msgid "Error description..."
 msgstr "Taolennadur"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 #, fuzzy
 msgid "Please wait while retrieving command list..."
 msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 #, fuzzy
 msgid "Please wait while the command is sending..."
 msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr ""
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Taolennadur</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 #, 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Aozer kefluniañ dre ar munut"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Sil:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Dilemel MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "A zilam kemennadenn an devezh"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Flapoù prevez"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr "A gas ur gemennadenn d'an arveridi luget war ar servijer-mañ"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Lakaat MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "A laka kemennadenn an devezh"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "Diskouez ar gonsol _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Hizivaat MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "A hiziva kemennadenn an devez"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Merour-ez"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Kas ur gemennadenn d'ar servijer"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 #, fuzzy
 msgid "<b>Actions</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 #, fuzzy
 msgid "<b>Conditions</b>"
 msgstr "<b>Sonioù</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sonioù</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 #, fuzzy
 msgid "Advanced Actions"
 msgstr "Actions a_vancées"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Aozer kefluniañ dre ar munut"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 #, fuzzy
 msgid "All statuses"
 msgstr "Stad:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Ezvezant"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Diwelus"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 #, fuzzy
 msgid "Launch a command"
 msgstr "urzhiad"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Dihegerz"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Prest da flapiñ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 #, fuzzy
 msgid "Play a sound"
 msgstr "_Seniñ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
+#: ../data/gui/advanced_notifications_window.ui.h:25
+#, fuzzy
+msgid "Receive a Message"
+msgstr "Kemennadenn hiniennel nevez"
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/gui/advanced_notifications_window.ui.h:26
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../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/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 #, fuzzy
 msgid "for "
 msgstr "Porzh:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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 ""
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
 msgstr "Bro:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "anv ar gwiskadur"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
 msgid "Last modified:"
 msgstr "Anv:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "Darempredoù"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Titouroù-stad raklakaet</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Titouroù-stad raklakaet</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Sonioù</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Cheñch ar ger-kuzh"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Roit anezhañ en-dro evit kadarnaat:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Roit ur ger-kuzh nevez:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Oberiant"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Webgaoz:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Kemennadennoù raklakaet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Enrollañ evel raklakaet..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Ebarzhiñ ur _webgaoz"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Ouzhpennañ er roll"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopiañ ar JID/Chomlec'h postel"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiañ chomlec'h an ere"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Digeriñ ar bostelerez"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Digerién an ere er furcher web"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Kregiñ da flapiñ"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Kas"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "Diwelus"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "Sellerien"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 #, fuzzy
 msgid "A_sk to see his/her status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "Ouzhpennañ ur gelaouenn _ispisial"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "Assigner une clé OpenPGP"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "urzhiad"
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Kemmañ ar _strolladoù"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Darempredoù"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Dilemel"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Kas ur gemennadenn _simpl..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "Kas ur _restr"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Kregiñ da _flapiñ"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Ouzhpennañ er roll"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "He/E aotren da welet ma stad"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Difenn dezhañ/dezhi gwelet ma stad"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Istoradur"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "Darempredoù"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Adenvel"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Koumanant"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "_Kenderc'hel"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Er strollad"
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Kefluniañ ar webgaoz"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Kemmañ ar strolladoù"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Taolennadur</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Perzhioù ar servijerien"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Nullañ an treuzkas"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "A nulla an treuzkas dibabet"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Naetaat"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Treuzkasoù"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "A guzha ar prenestr"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Dilemel an treuzkas restroù diwar ar roll"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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,76 +1198,74 @@ 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/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Kenderc'hel"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Kelaouiñ ac'hanon p'eo echu un treuzkas"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Digeriñ ar renkell pal"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Ehan"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "roll an treuzkasadoù"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Liv-stad an ivinelloù</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
+#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Kont\n"
-"Strollad\n"
-"Darempred\n"
-"Titl"
+msgid "Account row"
+msgstr "Kont"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Tev"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../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ñ"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Darempredoù"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Neuz an nodrezh:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Personelaat gwiskadurioù Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Aet kuit"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Strollad"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Dizoberiant"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Stouet"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1379,7 +1273,7 @@ msgstr ""
 "Kemennadennoù\n"
 "webgaoz"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1388,141 +1282,94 @@ msgstr ""
 "kaset davet\n"
 "webkaozioù"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Ehan"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Liv ar skrid:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Nodrezh ar skrid:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Drekleur:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "Cheñch _lesanv"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "Kemmañ ar _sujed"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "Ke_fluniañ ar flap"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Merañ ar sinedoù"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Ka_sour-ez"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Galloudoù an darempred"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Kas ur _restr"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Ouzhpennañ er roll"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Merour-ez"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Argas"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Ermaeziañ"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Ezel"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Perc'hener-ez"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Kas ur gemennadenn brevez"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Digant"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Titl"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 #, 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Dilemel"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Ezporzhiañ"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Merour istoradur Gajim"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1531,424 +1378,439 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Klask en titourva"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Anv an darempred"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Flapoù a-stroll"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Klask"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Istoradur flapiñ"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+msgid "Bro_wse Rooms"
+msgstr "_Furchal"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/gui/join_groupchat_window.ui.h:4
 #, fuzzy
-msgid "Join this room automatically when I connect"
+msgid "Join this room _automatically when I connect"
 msgstr "Aozañ ma aelad pa lugan"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Lesanv:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Ger-kuzh:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Nevez 'zo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Webgaoz:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Servijer:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "E_barzhiñ"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Merañ ar c'hontoù"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Merañ ar sinedoù"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 #, fuzzy
 msgid "Print status:"
 msgstr "Diskouez an eur:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Servijer:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Titl:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Kefluniañ ar webgaoz"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Kenderc'hel"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "Dilemel"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Perzhioù</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Dibarzhioù</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr "Kevreadenn HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Merañ an aeladoù proksi"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Ger-kuzh:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proksi:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Porzh:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Implij an diskleriañ"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "_URL :"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+#, fuzzy
+msgid "_Name:"
+msgstr "_Anv:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Doare:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Anv:"
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Ouzhennañ an darempred d'ar roll"
-
-#: ../data/glade/message_window.glade.h:2
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Cheñch _lesanv"
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "a zo aketus d'ar gaozeadenn"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Kas"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Ger-kuzh"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Aozer kefluniañ munut</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Poelladoù</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Liv-stad an ivinelloù</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Kelaouennoù dre welet</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Sonioù</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Personelaet</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Sonioù</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 #, fuzzy
 msgid "<b>GMail Options</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Titouroù-stad raklakaet</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<b>Perzhioù</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Titouroù-stad raklakaet</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Perzhioù</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Furmad ul linenn</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Kelaouennoù dre welet</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Dre ar munut"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Dre ar munut"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"An holl stadoù\n"
-"O skrivañ hepken\n"
-"Lazhet"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Stad:"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Aotren e vefe kaset titouroù diwar-benn an _OS"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../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"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Ezvezant"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Goulenn an titour-stad pa:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"Détection automatique à chaque démarrage\n"
-"Toujours utiliser les applications par défaut de GNOME\n"
-"Toujours utiliser les applications par défaut de KDE\n"
-"Personnalisé"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "K_evreañ en ur loc'hañ Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "_Titour-stad:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "O skrivañ"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "_Titour-stad:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Anv an darempred"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personelaet</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Dizoberiant"
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Diskouez _skeudennigoù an darempredoù er roll"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Diskouez _skeudennigoù an darempredoù er roll"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Diskouez titouroù-stad an darempredoù e-barzh ar roll"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1959,7 +1821,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1969,7 +1831,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1977,25 +1839,25 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est déconnecté"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
@@ -2003,13 +1865,13 @@ msgstr ""
 "Si cette case est cochée, Gajim placera une icône dans la zone de "
 "notification"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2017,7 +1879,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/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"
@@ -2025,7 +1887,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2033,7 +1895,15 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location 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:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2041,7 +1911,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2049,14 +1919,14 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2067,20 +1937,20 @@ msgstr ""
 "vous spamme/ennuie. Utilisez la avec précaution, car elle bloque tous les "
 "messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2090,13 +1960,13 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent, occupé, etc)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2104,108 +1974,133 @@ msgstr ""
 "M'eo lazhet, ne vo ket erlec'hiet ar voulomelloù ascii doare ':)' gant "
 "boulomelloù grafikel fiñv pe difiñv"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Ur prenestr-flapiñ:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Me_rañ..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Morse"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Kemmañ ar gont"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ma c'helaouiñ pa c'hoarvez gant un darempred:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Kelaouiñ ac'hanon"
+
+#: ../data/gui/preferences_window.ui.h:88
 #, fuzzy
 msgid "Notify on new _GMail email"
 msgstr "Ma c'helaouiñ evit ar c'hemennadennoù _Gmail nevez"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Titouroù hiniennel"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "_Seniñ"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "Di_foupañ"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Penndibaboù"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servijer:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Diskouez er _roll hepken"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "Diskouez er _roll hepken"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Lugañ"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Dilugañ"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Urzhiañ an darempredoù hervez o stad"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Stad"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "_Arlunioù-stad dre-ziouer:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Gwiskadur:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2213,7 +2108,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2221,612 +2116,576 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Implij arlunioù an _dorioù"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Pa resever un darvoud nevez"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "_A-raok al lesanv:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "Bezañ lakaet da _ezvezant war-lerc'h:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Furcher web:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Boulomelloù:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "Merour _restroù:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Islinennañ ar fazioù reizhskrivañ"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Chom hep teurel pled eus ar c'hemennadennoù kaset gant tud dianav"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Menegiñ kemmoù stad an darempredoù e-barzh an istoradur"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Meziant posteliñ:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Bezañ lakaet evel _dihegerz war-lerc'h:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Digeriñ..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Distreiñ gant al livioù dre-ziouer"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Titou_roù-stad ar flap:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Titour-stad:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "Ebarzhiñ ur _webgaoz"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "Ket er roll"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "munutenn"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 #, fuzzy
 msgid "Privacy Lists:"
 msgstr "Flapoù prevez"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 #, fuzzy
 msgid "Active on each startup"
 msgstr "K_evreañ en ur loc'hañ Gajim"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "_Koumanant"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Nac'hañ"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 #, fuzzy
 msgid "JabberID"
 msgstr "ID Jabber:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 #, fuzzy
 msgid "Order:"
 msgstr "Servijer:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 #, fuzzy
 msgid "Privacy List"
 msgstr "Roll argas"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Koumanant"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 #, fuzzy
 msgid "all in the group"
 msgstr "Er strollad"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "An daou"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Digant"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "Hini ebet"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "piv"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 #, fuzzy
 msgid "to send me messages"
 msgstr "Kas ur gemennadenn"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 #, fuzzy
 msgid "to send me status"
 msgstr "Goulenn evit gwelet e/he stad"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
 msgid "to view my status"
 msgstr "He/E aotren da welet ma stad"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../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/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "Dibab ur _skeudenn"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Personelaet</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../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/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Sonioù</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Departamant:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "Postel:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Chomlec'h 2:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familh:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Personelaet</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Lec'hienn hiniennel:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Personelaet</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Lesanv:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Pellgomz:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Sonioù</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Kod postel:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Perzhioù</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Sonioù</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Dibarzhioù</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Dibarzhioù</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sonioù</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Diwar-benn"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr ""
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 #, fuzzy
 msgid "Personal Info"
 msgstr "Titouroù hiniennel"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Labour"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Dilemel ar gont diwar Gajim _hepken"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Dilemel ar gont diwar Gajim ha diwar ar _servijer"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Dilemel"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Mat eo"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Dilemel"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Ouzhpennañ un darempred..."
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Perzhioù ar servijerien"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Treuzkasoù"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Marc'had Ar Goulennoù (FAQ enlinenn)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Skoazell enlinenn"
 
-#: ../data/glade/roster_window.glade.h:8
-#, fuzzy
-msgid "Profile, A_vatar"
-msgstr "Aelad, Avatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Dorioù"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Diskouez an darempredoù _ezlinenn"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Diskouez ar _roll-darempredoù"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Kontoù"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Oberoù"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Endalc'hadoù"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Aozañ"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Skoazell"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Penndibaboù"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Kuitaat"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Kas ur gemennadenn _simpl..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr ""
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "Gortozit marplij e keit ma vez dilec'hiet an istoradur..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Klask"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Ouzhpennañ un _darempred"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "Titouroù"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Klask"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Mont"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Chomlec'h:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "En em enrollañ war"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Nullañ"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Digant:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Respont d'ar gemennadenn-mañ"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Kas"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Kas ur gemennadenn"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Kas ar gemennadenn ha serriñ ar prenestr"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Titl:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Da:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Respont"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Kas & Serriñ"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 #, fuzzy
 msgid "Au_thorize"
 msgstr "_Aotren"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
@@ -2834,191 +2693,206 @@ msgid ""
 msgstr ""
 "Nac'hañ aotre an darempred evit ma ne welo ket hag eñ oc'h kevreet pe get"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Goulenn koumanantiñ"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Nac'hañ"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 #, fuzzy
 msgid "Mute Sounds"
 msgstr "Sonioù wav"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Kas ur gemennadenn _simpl"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Diskouez an holl _zarvoudoù o c'hortoz"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "S_tad"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Webkaozioù"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Personelaet</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Dibarzhioù</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID Jabber:"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Une erreur de protocole s'est produite :"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Dibarzhioù</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Taolennadur</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personelaet</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 #, fuzzy
 msgid "Comments"
 msgstr "Evezhiadenn: %s"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Ke_fluniañ ar flap"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Darempredoù"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Titouroù"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Muioc'h"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "Choisissez un Avatar"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Sonioù</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr ""
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr ""
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Enaouiñ"
+#: ../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"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Titour/Goulenn"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Kemennadenn"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Bezañs"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Kemmañ ar gont..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr ""
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 #, fuzzy
 msgid "Personal"
 msgstr "Titouroù hiniennel"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr ""
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Stad:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Ur flaperez Jabber e GTK+"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Titouroù"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3046,7 +2920,7 @@ msgstr "Er strollad"
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr ""
 
@@ -3189,134 +3063,134 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "Islinennañ"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Lesanv"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "_Nodrezh:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Titouroù"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "War enaou emañ ar sifrañ"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Ket er roll"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Ur roll eus an treuzkasoù oberiant, echu pe arsavet"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Implij an diskleriañ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Implij an diskleriañ"
@@ -3324,58 +3198,58 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, 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:2388
+#: ../src/chat_control.py:2475
 #, 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:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3383,135 +3257,145 @@ msgstr ""
 "Ma serrit ar prenestr-mañ ha n'eo ket enaouet an istoradur, e vo kollet ar "
 "gemennadenn."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "o krouiñ titourva an istoradur"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "o krouiñ titourva an istoradur"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Emañ Gajim o vont da guitaat diouzhtu"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "a grou ar renkell %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 #, fuzzy
 msgid "Change status information"
 msgstr "Titouroù"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 #, fuzzy
 msgid "Change status"
 msgstr "Darempred diluget"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 #, fuzzy
 msgid "Free for chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 #, fuzzy
 msgid "Online"
 msgstr "_Kenderc'hel"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 #, fuzzy
 msgid "Presence description:"
 msgstr "Taolennadur"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Flap a-stroll"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s : %(message)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "Er strollad"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Gajim - %d gemennadenn nevez"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3610,9 +3494,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Dilemel"
@@ -3862,23 +3746,23 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:230
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3887,35 +3771,35 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:242
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3927,7 +3811,7 @@ msgstr ""
 "l'information sha dans les présences des salons"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3945,485 +3829,502 @@ 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:245
+#: ../src/common/config.py:246
 #, 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:246
+#: ../src/common/config.py:247
 #, 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:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "A guzha an nozelennoù er prenestroù webgaoz"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 #, 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:251
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Kas ar gemennadenn ha serriñ ar prenestr"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../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:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, 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:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "O kousket"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Distro 'benn nebeut"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Distro 'vin a-benn un nebeut munutennoù.."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "O tebriñ"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "O tebriñ 'maon, neuze laoskit ur gemennadenn."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "O sellout ouzh ur film 'maon."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "O labourat"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "O labourat 'maon."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Pellgomz"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Ouzh ar pellgomz emaon."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Er-maez"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Er-maez emaon o profitañ eus ar vuhez"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 #, fuzzy
 msgid "I'm available."
 msgstr "Hegerz"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Prest da flapiñ"
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Distro a-benn nebeut."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 #, fuzzy
 msgid "I'm not available."
 msgstr "Dihegerz"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:475
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "Glas"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "Mab-den"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "Glas-mor"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:251
-#, fuzzy
-msgid "Wrong host"
-msgstr "Ger-kuzh faos"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, 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:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Gant berzh eo bet embannet ar vCard"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "N'eus ket bet kavet al lesanv : %s"
@@ -4431,79 +4332,79 @@ msgstr "N'eus ket bet kavet al lesanv : %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4643,28 +4544,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Sifret eo ar gemennadenn-mañ]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4673,154 +4574,154 @@ msgstr ""
 "Titl : %s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Kollet eo bet al lugadenn gant ar gont \"%s\""
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Respont direizh"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Gwiriekait ho lugadenn pe klaskit diwezhatoc'h."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Kevreadenn"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Dibosupl eo en em lugañ da \"%s\""
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Aozadur D-Bus dianav: %s"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Gwiriekait ho lugadenn pe klaskit en-dro diwezhatoc'h"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "C'hwitet an diskleriadenn gant \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Gwiriekait ho ker-kuzh hag anv-lugañ."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Darempredoù"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Sellerien"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Dorioù"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 #, fuzzy
 msgid "Not in roster"
 msgstr "Ket er roll"
@@ -4831,39 +4732,55 @@ msgstr "Ket er roll"
 msgid "D-Bus python bindings are missing in this computer"
 msgstr ""
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr ""
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (ou python-pysqlite2) n'eo ket staliet. O kuitaat..."
+#: ../src/common/dbus_support.py:54
+#, 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/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr ""
+"N'eus ket eus D-Bus war an urzhiataer-mañ, pe mankout a ra ur mollad python"
+
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Servij dihegerz: n'eo ket loc'het Gajim, pe lakaet eo bet remote_control war "
 "False"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr "Le bus de session n'est pas disponible"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Dihegerz eo bus an estez.\n"
 "Klaskit o lenn http://trac.gajim.org/wiki/GajimDBus"
@@ -5042,244 +4959,281 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Arouezenn ziereizh en anv-arveriad-ez"
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Chomlec'h ar servijer dre ret"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Arouezenn zireizh en anv-ostiz."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr ""
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr ""
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "D_ihegerz"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Prest da flapiñ"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Prest da flapiñ"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Hegerz"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Hegerz"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "O lugañ"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "E_zvezant"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Ezlinenn"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Ezlinenn"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Diwelus"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Dianav"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "fazi"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Da"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "An daou"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Emezelañ"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Kasourien"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Kasour-ez"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Perzhidi"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Perzhiad-ez"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Gweladennerien"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Gweladenner-ez"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Hini ebet"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 #, fuzzy
 msgid "Owner"
 msgstr "_Perc'hener-ez"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 #, fuzzy
 msgid "Administrator"
 msgstr "_Merour-ez"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 #, fuzzy
 msgid "Member"
 msgstr "_Ezel"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "a zo aketus d'ar gaozeadenn"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "a ra un dra bennak all"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "a zo paouezet da skrivañ ar gemennadenn"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 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:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s Go"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mo"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s Ko"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Kefluniañ ar webgaoz"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5289,17 +5243,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Titour-stad"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Ment: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fazi: dibosupl eo digeriñ %s evit lenn"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "Cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "o krouiñ titourva an istoradur"
@@ -6001,19 +6012,19 @@ msgstr ""
 msgid "Writing"
 msgstr "O labourat"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6021,19 +6032,19 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../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:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6100,95 +6111,91 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Dizoberiant"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Titour-stad"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Enaouiñ"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "N'eus ket tu da gevreañ"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, 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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "titl ar gemennadenn stad"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "korf ar gemennadenn stad"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Anv"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Adlugañ bremañ?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "N'eus ket tu da implij OpenPGP war an urzhiataer-mañ"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Darvoudoù chomet dilenn"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Lennit an holl zarvoudoù a-raok lemel ar gont-mañ."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Luget oc'h d'ar servijer"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 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:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6196,148 +6203,148 @@ msgstr ""
 "Implijet e vez an anv-mañ gant unan eus ho kontoù dija. Dibabit un anv all "
 "marplij."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Anv-kont direizh"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "N'hell ket anv ar gont chom goullo."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "N'hell ket anv ar gont kaout esaouennoù."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "Merañ ar c'hontoù"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 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:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Road direizh"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Ar porzh personelaet a rank bezañ un niverenn borzh"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Fazi en ur dapout an alc'hwezhioù kuzh"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, 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:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Dibab un alc'hwezh OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Dibabit hoc'h alc'hwezh OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Kont dihegerz"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "N'oc'h ket luget d'ar servijer"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 #, 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:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, 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:2354
+#: ../src/config.py:2460
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Anv-kont implijet dija"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Kemmañ %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Emezelañ war %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Roll argas"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Roll an izili"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Roll ar perc'hennerien"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Roll ar verourien"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Abeg"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Lesanv"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Perzh"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Oc'h argas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6345,11 +6352,11 @@ msgstr ""
 "<b>Piv a fell deoc'h argas ?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Oc'h ouzhpennañ un ezel..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6357,11 +6364,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da ezel ?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Oc'h ouzhpennañ ur perc'henn..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6370,11 +6377,11 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da berc'henn ?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Oc'h ouzhpennañ ur v-merour-ez..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6382,7 +6389,7 @@ msgstr ""
 "<b>Piv a fell deoc'h lakaat da verour-ez ?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6400,63 +6407,91 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Lemel ar gont %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Lazhet eo ar sifrañ"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Roit ho ker-kuzh evit ar gont %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Enrollañ ar ger-kuzh"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Ma tilamit anezhañ, e voc'h diluget."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Kevreadenn"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Petra a fell deoc'h ober?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Dilemel ar gont diwar Gajim _hepken"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 #, fuzzy
 msgid "Default"
 msgstr "Dilemel"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Diskouez an eur:"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Bez ez eus titouroù direizh er sined-mañ"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6464,31 +6499,31 @@ msgstr ""
 "sined-mañ."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Road direizh"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar gont!"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6499,34 +6534,34 @@ msgstr ""
 "Araoket, pe hen ober diwezhatoc'h en ur glikañ war Kontoù er meuziad Aozañ "
 "eus ar prenestr pennañ."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 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:3383
+#: ../src/config.py:3525
 #, 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:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Darempred er roll dija"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6536,7 +6571,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6544,62 +6579,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Bez ez eus bet ur fazi en ur grouiñ ar gont"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Implijet eo an anv-kont dija"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Bez ho peus ur gont gant an anv-se dija."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Oberiant"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Darvoud"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Kemennadenn gentañ"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Kemennadenn da-heul"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Darempred luget"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Darempred diluget"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Kemennadenn gaset"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un Salon mis en Sur-brillance"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Kemennadenn digant ur sal-flapiñ"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Resevet ar bedadenn"
@@ -6620,46 +6655,46 @@ msgstr ""
 "Dindan al linenn e welit ar pezh a zo bet lâret er sal-flapiñ dibaoe ar wech "
 "diwezhañ ho peus taolet ur sell ennañ."
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Kuitaat"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Oberoù evit \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Lenn pennad _Wikipedia"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Klask er _geriadur"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, 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:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Web_klask"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr ""
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6667,7 +6702,7 @@ msgstr[0] "Dec'h"
 msgstr[1] "Dec'h"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujed: %s\n"
@@ -6780,75 +6815,75 @@ msgstr "Chomlec'h 2:"
 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "ID-arveriad-ez direizh"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr ""
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Laouen 'vefen d'ho ouzhpennañ em roll-darempredoù."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Darempred er roll dija"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Emañ an darempred en ho roll-darempredoù dija."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 #, fuzzy
 msgid "User ID:"
 msgstr "ID arveriad-ez:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Ur flaperez jabber e GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 #, fuzzy
 msgid "Current Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Diorroerien kent:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "TRUGAREZ DA:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Troet e brezhoneg gant\n"
 "Giulia Fraboulet <djoulia@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6857,109 +6892,109 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Goulenn enskrivañ digant %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Emaoc'h er webgaoz %s dija"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ebarzhiñ ur sal-flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Anv-kont direizh"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, 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:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, 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:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Bez ez eus arouezioù difennet en anv ar sal pe hini ar servijer."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "A guzha an nozelennoù er prenestr flapiñ"
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 #, 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:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Servijer"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Luget eo ar gont \"%s\" d'ar servijer"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Kregiñ da flapiñ gant ar gont %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Kregiñ da flapiñ"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6969,175 +7004,173 @@ msgstr ""
 "dezhañ:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "N'eus ket tu en em lugañ"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Gwiriekait oc'h luget gant \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 #, fuzzy
 msgid "Invalid JID"
 msgstr "ID jabber direizh"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Rankout a rit bezañ luget evit cheñch ger-kuzh."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Ger-kuzh direizh"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Rankout a rit reiñ ur ger-kuzh."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Rankout a ra an daou c'her-kuzh bezañ heñvel en daou dakad."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Darempred luget"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Darempred diluget"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Kemennadenn nevez"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Kemennadenn simpl nevez"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Kemennadenn hiniennel nevez"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Postel nevez"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Fazi treuzkas"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Echu an treuzkasadenn"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Sac'het an treuzkas"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Pedadenn evit ur sal-flapiñ"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Darempred diluget"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Kemennadenn simpl gant ar gont %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Kemennadenn simpl"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Kas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "%s resevet"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a skrivas:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr ""
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Chomlec'h"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "_Kemmañ"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Dilemel"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7145,163 +7178,163 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 #, fuzzy
 msgid "Add"
 msgstr "Chomlec'h"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "_Kemmañ"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Dilemel"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Strollad"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Ouzhpennañ un _darempred"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Taolennadur: %s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Furmad ul linenn</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Flapoù prevez"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 #, 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:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 #, 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:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Evezhiadenn: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Dibabit ur son"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "An holl restroù"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Sonioù wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Dibabit ur skeudenn"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Skeudennoù"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Pa teu %s da vezañ:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Oc'h ouzhpennañ ur gelaouenn nevez evit %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr ""
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 #, fuzzy
 msgid "Condition"
 msgstr "Kevreadenn"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7309,38 +7342,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7350,77 +7383,77 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Traoù all"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Kendiviz"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 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:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Merañ servijoù ar gont %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Merañ ar servijoù"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "N'eo ket bet kavet ar servij"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7428,98 +7461,103 @@ msgstr ""
 "N'eus servij ebet er chomlec'h roet, pe ne respont ket. Gwiriekait ar "
 "chomlec'h ha klaskit en-dro."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "N'eus ket tu furchal er servij"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Anv-arveriad-ez direizh"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, 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:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Furchal"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "N'eus elfenn ebet da furchal er servij-mañ."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "urzhiad"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "_Emezelañ"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Arveridi"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Taolennadur"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Sined lakaet dija"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Emañ ar flap \"%s\" en ho sinedoù dija."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Gant berzh eo bet ouzhpennet ar sined"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 #, fuzzy
 msgid "Subscribed"
 msgstr "Emezelañ"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 #, fuzzy
 msgid "Node"
 msgstr "Hini ebet"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Koumanantiñ"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Koumanantiñ"
@@ -7569,7 +7607,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7735,103 +7773,91 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "Perzhioù ar servijerien"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Restr"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Mare"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Araokadur"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Anv ar restr: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "C'hwi"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Kaser: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Resever:"
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enrollet e-barzh: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Echu eo an treuzkas"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Digeriñ ar renkell pal"
+
+#: ../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:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Resever:"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Sac'het an treuzkas"
@@ -7840,7 +7866,7 @@ msgstr "Sac'het an treuzkas"
 msgid "Choose File to Send..."
 msgstr "Dibabit ur restr da gas..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Taolennadur: %s"
@@ -7873,33 +7899,33 @@ msgstr "Taolennadur: %s"
 msgid "%s wants to send you a file:"
 msgstr "Fellout a ra da %s kas deoc'h ur restr:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Bez ez eus eus ar restr-mañ dija"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -7935,78 +7961,60 @@ msgstr "Restr:"
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Anv:"
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Kaser:"
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Ehan"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Kenderc'hel"
+
+#: ../src/gajim.py:141
 #, 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:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus PyGTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr ""
 "Ezhomm en deus Gajim eus GTK 2.6 pe uheloc'h evit labourat. O kuitaat..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr ""
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Dilamit al levraoueg red eus GTK+runtime ha staliit an aozadur stabil "
-"diwezhañ diwar %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8014,11 +8022,11 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8061,8 +8069,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "kont"
 
@@ -8084,12 +8092,15 @@ msgid "status"
 msgstr "stad"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "unan eus: offline, online, chat, away, xa, dnd, invisible "
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "kemennadenn"
 
@@ -8332,79 +8343,95 @@ msgid ""
 msgstr ""
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "korf ar gemennadenn"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Ebarzhiñ ur webgaoz nevez"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "room"
 msgstr "Digant"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Webgaoz:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "nick"
 msgstr "Lesanv"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "N'eus ket bet kavet al lesanv : %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "password"
 msgstr "Ger-kuzh:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Ne glot ket ar gerioù-kuzh"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Diskouez pe kuzhat ar prenestr pennañ"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8413,31 +8440,31 @@ msgstr ""
 "N'emañ ket '%s' en hor roll darempredoù.\n"
 "Resisait ar gont evit kas ur gemennadenn."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "N'ho peus kont bev ebet"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "N'eo ket bet kavet %s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8446,21 +8473,25 @@ msgstr ""
 "Implij: %s urzhiad [arguments]\n"
 "urzhiad eo unan eus :\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Ger-kuzh faos"
@@ -8491,199 +8522,200 @@ msgstr "N'hellit ket dilemel ar gwiskadur red"
 msgid "Please first choose another for your current theme."
 msgstr "Dibabit ur gwiskadur all da gentañ."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Kas ar gemennadenn brevez c'hwitet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Cheñch _lesanv"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Istoradur ar gaoz"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Kevreadenn"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Gant berzh eo bet krouet ho kont nevez!"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a zo bet skarzhet : %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a zo argaset : %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Anavezet oc'h bremañ gant an anv %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s a zo bremañ %s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr ""
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "Aet eo kuit %s"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Er strollad"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 a zo bremañ %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 #, 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Chom hep goulenn ket"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Cheñch ar sujed"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Skrivit ar sujed nevez:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Cheñch lesanv"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Skrivit al lesanv nevez a fell deoc'h implij:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Taolennadur: %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Skarzhañ %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Bez e c'hellit reiñ un abeg amañ dindan:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Argas %s"
@@ -8702,60 +8734,60 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Diskleriañ ar Bug"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Munudoù"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fazi: dibosupl eo digeriñ %s evit e lenn"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Voulez-vous l'écraser ?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:881
+#: ../src/gtkgui_helpers.py:924
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Enrollañ ar restr dindan..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8766,166 +8798,166 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Degemer a rit ar goulenn-mañ?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Aotre HTTP (%s) evit %s (id : %s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Kevreadenn"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fazi en ur gas %s ( %s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Goulenn koumanantiñ"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Aotre degmeret"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Dilamet eo bet ho aotre digant \"%s\""
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Koumanantiñ"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "N'eus ket tu da dizhout \"%s\""
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Luget oc'h hep hoc'h alc'hwezh OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Direizh eo ho ker-kuzh"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Postel nevez war %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8935,102 +8967,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, 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:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fazi en ur lenn ar restr:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Da _bep kemennadenn:"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 #, 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, 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:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Goulenn treuzkas"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9038,15 +9071,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9057,91 +9090,101 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Kevreadenn"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"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:2064
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Lazhet eo ar sifrañ"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 #, 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Dibosupl eo enrollañ ho tibarzhioù ha dibaboù"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Ger-kuzh ret"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Roit ho ker-kuzh GPG evit ar gont %s."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Luget e voc'h da %s hep OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Ger-kuzh faos"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
 
@@ -9150,37 +9193,37 @@ msgstr "Adroit ho ker-kuzh GPG pe pouezit war Nullañ."
 msgid "_New Group Chat"
 msgstr "Flap a-stroll"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Laouen 'vefen d'az ouzhpennañ em roll-darempredoù"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Dibosupl eo kavout titourva an istoradur"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Darempredoù"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Deiziad"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Lesanv"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Kemennadenn"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9188,7 +9231,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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9197,27 +9240,27 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Oc'h ezporzhiañ an istoradur..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 #, fuzzy
 msgid "This is an irreversible operation."
 msgstr "Setu un ober n'eus ket tu da vont war e giz."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9256,38 +9299,38 @@ msgstr "Ar stad a zo bremañ: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Ar stad a zo bremañ: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Flapoù"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Flapoù a-stroll"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Flapoù prevez"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Kemennadennoù"
 
@@ -9299,22 +9342,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a zo bremañ %(status)s"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Emañ %(nickname)s o paouez lugañ"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Emañ %(nickname)s o paouez dilugañ"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Kemennadenn simpl nevez digant %(nickname)s"
@@ -9339,7 +9382,7 @@ msgstr "Kemennadenn nevez digant %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Kemennadenn nevez digant %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "_Kenderc'hel"
@@ -9348,12 +9391,12 @@ msgstr "_Kenderc'hel"
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "Treug ar restr"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "Ce salon n'existe pas."
@@ -9361,7 +9404,7 @@ msgstr "Ce salon n'existe pas."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Dibosupl eo kargañ ar skeudenn"
 
@@ -9394,51 +9437,51 @@ msgstr ""
 "Bez ez eus bet ur fazi en ur embann ho titouroù hiniennel, klaskit en-dro "
 "diwezhatoc'h."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Kontoù strollet"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Kaset eo bet an aotre"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Anavezout a raio \"%s\" ho stad adalek bremañ."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Kaset eo bet ar goulenn goumanantiñ"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Dilamet eo bet an aotre"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, 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:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Luget e voc'h da %s hep OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 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:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9446,28 +9489,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, 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:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Nullañ an treuzkas"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Kemennadennoù nevez ho peus"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9475,17 +9529,17 @@ msgid ""
 msgstr ""
 "Posubl e vo lenn ar gemennadennoù diwezhatoc'h m'emañ an istoradur war enaou."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 #, 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:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9494,12 +9548,12 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Dilamet e vo an nor \"%s\""
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9508,73 +9562,73 @@ msgstr ""
 "N'helloc'h ket mui kas pe resev kemennadennoù d'an darempredoù liammet gant "
 "an nor-mañ."
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 #, 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:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Darempredoù"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, 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:2749
+#: ../src/roster_window.py:2832
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, 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:2791
+#: ../src/roster_window.py:2878
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Dilemel"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Dilemel an darempred diouzh ar roll"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 #, fuzzy
 msgid "Select a key to apply to the contact"
 msgstr "Dibabit un alc'hwezh da"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, 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:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9583,12 +9637,12 @@ msgstr ""
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Petra a fell deoc'h ober?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9596,17 +9650,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Dilamet e vo an darempred \"%s\" diouzh ar roll"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9615,68 +9669,68 @@ msgstr ""
 "En ur zilemel an darempred-mañ, e tilamit ivez e/he aotre. Atav e welo "
 "ac'hanoc'h evel pa vefec'h ezlinenn."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Kont ebet hegerz"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 #, 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:3986
+#: ../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."
 msgstr ""
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Restr direizh"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Kas %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Strollañ %s ha %s"
@@ -9686,138 +9740,142 @@ msgstr "Strollañ %s ha %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "en ur implij ar gont %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "d'ar gont %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "en ur implij ar gont %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Merañ ar sinedoù..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "eus ar gont %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "evit ar gont %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Kemmañ an titour-stad"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Embann"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Embann"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Dizoleiñ ar servijoù..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "_Kas ur gemennadenn d'ar servijer"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilisateurs En _Ligne"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Darempredoù"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Kemmañ ar _strolladoù"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Kas ur gemennadenn simpl"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Dorioù"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Dorioù"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Adenvel"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Darempred diluget"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Darempred diluget"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Merour an istoradur"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Ebarzhiñ ur sal-flapiñ"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Kemmañ an titour-stad..."
 
@@ -9852,9 +9910,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9867,120 +9925,130 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Kemmañ an titour-stad..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Ket er roll"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Kuzhat ar meuziad-mañ"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID Jabber:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Stad:"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Stad diwezhañ: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "dibaoe %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "Kevreadenn"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "Darempred diluget"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Koumanant:"
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Doare:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Kemmañ ar gont"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Pellgargañ"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Kas"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Doare:"
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Treuzkaset:"
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "N'eo ket kroget"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Arsavet"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Echu"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "O treuzkas"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 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:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9988,37 +10056,37 @@ msgstr ""
 "N'eus ket bet kaset titouroù munut gant ar servij-mañ.\n"
 "Sur 'walc'h eo torr pe kamm"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Dianav"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "dibaoe %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Poelladoù</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 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:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10026,30 +10094,287 @@ msgstr ""
 "Dedennet oc'h gant bezañs an darempred-mañ, met hennezh/hounnez n'eo ket "
 "gant ho hini"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 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:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr ""
 
+#, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Ebarzhiñ ur _webgaoz"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Ouzhpennañ un darempred..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Dizoleiñ ar servijoù"
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "_Kemmañ ar gont..."
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Titouroù hiniennel"
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "_Kregiñ da flapiñ"
+
+#~ msgid "_Status"
+#~ msgstr "_Stad"
+
+#~ msgid "Account Modification"
+#~ msgstr "Kemmañ ar gont"
+
+#~ 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 ""
+#~ "Si vous cochez cette case, Gajim se connectera sur le port 5223, sur "
+#~ "lequel les serveurs sont supposés gérer le SSL. Notez que Gajim utilise "
+#~ "le cryptage TLS par défaut si le serveur annonce qu'il le supporte, et "
+#~ "avec cette option vous désactivez le TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Kemmañ an titouroù hiniennel..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Servijer:"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Si cette case est cochée, Gajim va sauvegarder le mot de passe dans ~/."
+#~ "gajim/config avec accès en lecture pour vous uniquement"
+
+#~ msgid "Port: "
+#~ msgstr "Porzh:"
+
+#~ msgid "Proxy:"
+#~ msgstr "Proksi:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "_Enrollañ ar ger-kuzh (diasur)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Kas ar pakadoù derc'hel al lugadenn vev"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Implij _SSL"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Dilemel MOTD"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Kas ur gemennadenn d'ar servijer"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Ebarzhiñ ur _webgaoz"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopiañ ar JID/Chomlec'h postel"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopiañ chomlec'h an ere"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Digeriñ ar bostelerez"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Digerién an ere er furcher web"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Kregiñ da flapiñ"
+
+#, fuzzy
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Kont\n"
+#~ "Strollad\n"
+#~ "Darempred\n"
+#~ "Titl"
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "Cheñch _lesanv"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "Kemmañ ar _sujed"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Ke_fluniañ ar flap"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Merañ ar sinedoù"
+
+#~ msgid "Send _File"
+#~ msgstr "Kas ur _restr"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Ouzhpennañ er roll"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Kas ur gemennadenn brevez"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Merañ ar c'hontoù"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "Dilemel"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Ouzhennañ an darempred d'ar roll"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Ouzhpennañ ar webgaoz d'ar sinedoù"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Cheñch _lesanv"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "a zo aketus d'ar gaozeadenn"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Klikit evit enlakaat ur boulomell (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "An holl stadoù\n"
+#~ "O skrivañ hepken\n"
+#~ "Lazhet"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Détection automatique à chaque démarrage\n"
+#~ "Toujours utiliser les applications par défaut de GNOME\n"
+#~ "Toujours utiliser les applications par défaut de KDE\n"
+#~ "Personnalisé"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Dilemel"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "_Ouzhpennañ un darempred..."
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "Perzhioù ar servijerien"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Treuzkasoù"
+
+#, fuzzy
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Aelad, Avatar"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Kontoù"
+
+#~ msgid "_Contents"
+#~ msgstr "_Endalc'hadoù"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Penndibaboù"
+
+#~ msgid "_Quit"
+#~ msgstr "_Kuitaat"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Kas ur gemennadenn _simpl..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Kas ur gemennadenn _simpl"
+
+#~ msgid "Sta_tus"
+#~ msgstr "S_tad"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Webkaozioù"
+
+#~ msgid "Enable"
+#~ msgstr "Enaouiñ"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Kemmañ ar gont..."
+
+#, fuzzy
+#~ msgid "Wrong host"
+#~ msgstr "Ger-kuzh faos"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (ou python-pysqlite2) n'eo ket staliet. O kuitaat..."
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Dilamit al levraoueg red eus GTK+runtime ha staliit an aozadur stabil "
+#~ "diwezhañ diwar %s"
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Ezhomm en deus Gajim eus PySQLite evit labourat"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "Kemennadenn o _tegouezhout:"
 
@@ -10229,10 +10554,6 @@ msgstr ""
 #~ msgid "Gajim account %s"
 #~ msgstr "eus ar gont %s"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Personelaet</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Eilañ an ID Jabber"
 
@@ -10382,9 +10703,6 @@ msgstr ""
 #~ msgid "Save _position and size for roster and chat windows"
 #~ msgstr "_Mirout lec'hiadur ha ment ar roll hag ar prenistri-flapiñ"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Diskouez er _roll hepken"
-
 #~ msgid "The auto away status message"
 #~ msgstr "An emc'hemennadenn evit ar stad \"Ezvezant\""
 
@@ -10415,18 +10733,9 @@ msgstr ""
 #~ msgid "_Before time:"
 #~ msgstr "_A-raok an eur:"
 
-#~ msgid "_Never"
-#~ msgstr "_Morse"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Kelaouiñ ac'hanon"
-
 #~ msgid "_Player:"
 #~ msgstr "_Soner:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "Di_foupañ"
-
 #~ msgid "Address"
 #~ msgstr "Chomlec'h"
 
@@ -10692,9 +11001,6 @@ msgstr ""
 #~ msgid "Size: "
 #~ msgstr "Taille : "
 
-#~ msgid "Session bus is not available"
-#~ msgstr "Le bus de session n'est pas disponible"
-
 #~ msgid "Sound"
 #~ msgstr "Son"
 
diff --git a/po/cs.po b/po/cs.po
index a8dfaf1f6..1a66452ad 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2010-01-22 14:35+0100\n"
 "Last-Translator: Petr Menšík <pihhan@cipis.net>\n"
 "Language-Team: <>\n"
@@ -32,60 +32,11 @@ msgstr ""
 "X-Poedit-Language: Czech\n"
 "X-Poedit-Country: CZECH REPUBLIC\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klient"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Vstoupit do _Diskuze"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "Přid_at kontakt..."
-
-# FIXME: chtelo by to cesky vyraz pro service discovery
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Prohlížet služby"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "Provést příkaz..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "Upravit účet"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Otevři schránku Gmailu"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "Osobní údaje"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Začít rozhovor"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Stav"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -95,23 +46,23 @@ msgstr ""
 "\n"
 "Prosím čekejte..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Prosím zvolte z následujících možností:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 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/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Prosím Vyberte server</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -119,487 +70,401 @@ msgstr ""
 "Přidat tento certifikát do důvěryhodných.\n"
 "SHA1 otisk certifikátu:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anon_ymní autentizace"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Připojit když stisknu Dokončit"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Průvodce vytváření účtu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Už mám účet který bych rád(a) použil(a)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Chtěl(a) bych za_registrovat nový účet"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Spravovat..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Žádný"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Uložit _heslo"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Nastavit profil, když se připojuji"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Použít vlastní jméno počítače/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
 msgstr "Potřebujete mít účet pro připojení k síti Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Rozšířené"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Dokončit"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "Počítač: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../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/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Osobní údaje</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "_Nastavit podle stavu"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Účet"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Úprava účtu"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Účty"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Seznam správců"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonymní autentizace"
+
+#: ../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í"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Připojit po startu Gajimu"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "_Změnit heslo"
 
-#: ../data/glade/account_modification_window.glade.h:10
-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"
+#: ../data/gui/accounts_window.ui.h:13
+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/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Vyberte _klíč..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Klikněte pro změnu hesla k účtu"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Klikněte k vyžádání autorizace od všech kontaktů jiného účtu"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "_Připojit po startu Gajimu"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Spojení"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Upravit osobní informace..."
+#: ../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 "Křestní:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112
-#: ../src/notify.py:560
-#: ../src/notify.py:581
-#: ../src/notify.py:620
-#: ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52
-#: ../src/common/contacts.py:135
-#: ../src/dialogs.py:111
-#: ../src/dialogs.py:121
-#: ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Obecné"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Počítač: "
+#: ../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 ""
+"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/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-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:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
-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:26
+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/glade/account_modification_window.glade.h:22
-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"
+#: ../data/gui/accounts_window.ui.h:27
+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/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
-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: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 ""
+"Pokud zaškrtnuto, jakákoliv změna globálního stavu (pomocí comboboxu na "
+"spodní straně Seznamu) změní stav tohoto účtu také"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account 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:29
+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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Informace o Vás, jak jsou uloženy na serveru"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35
-#: ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Příjmení:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Spojit účty"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3
-#: ../src/config.py:1158
-#: ../src/config.py:1261
-#: ../src/config.py:1550
-#: ../src/config.py:1555
-#: ../src/config.py:2103
-#: ../src/config.py:2182
-#: ../src/config.py:2195
-#: ../src/config.py:3396
-#: ../src/config.py:3469
-#: ../src/dialogs.py:308
-#: ../src/dialogs.py:310
-#: ../src/dialogs.py:513
-#: ../src/dialogs.py:526
-#: ../src/roster_window.py:2800
-#: ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Žádný"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Osobní údaje"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_ta:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The 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: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 ""
+"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/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Priorita se automaticky změní podle vašeho stavu."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Přejme_novat"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Zd_roj: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the 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/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Uložit _heslo (nebezpečné)"
+#: ../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 ""
+"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/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Uložit _historii pro všechny kontakty"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
 msgstr "Odesílat keep-alive pakety"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizovat stav účtu s globálním stavem"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Synchronizovat kontakty"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Použít _SSL (staré)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Použij proxy při přenosu souborů"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "N_astavit podle stavu"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Jméno: "
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "_Nastavit podle stavu"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Účty"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anonymní autentizace"
-
-#: ../data/glade/accounts_window.glade.h:13
-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/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "_Připojit po startu Gajimu"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Křestní:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Příjmení:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Spojit účty"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42
-#: ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Přejme_novat"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Odesílat keep-alive pakety"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Synch_ronizovat stav účtu s globálním stavem"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Synchronizovat kontakty"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Použít GPG _Agenta"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Použít vlastní _jméno počítače/port"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Použít _vlastní port:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Použij proxy při přenosu souborů"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Upravit osobní informace..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Povolit"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Počítač: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Spravovat..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Varovat před použitím nezabezpečeného spojení"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_použít proměnnou prostředí HTTP_PROXY"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "Úče_t: "
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Přidat nový kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -610,7 +475,7 @@ msgstr ""
 "abys mohl(a) přidat kontakty z tohoto protokolu.\n"
 "Klikni na tlačítko registrovat pro pokračování."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -618,410 +483,467 @@ msgstr ""
 "Musíš být připojen(á) k trasportu před přidáním\n"
 " kontaktu z tohoto protokolu."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Skupina:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Přezdívka:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "P_rotokol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registrovat"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Nastala chyba:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Vyber příkaz k provedení:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc příkazy - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Zkontroluj ještě jednou"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Popis chyby..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Prosím vyčkejte než stáhnu seznam příkazů..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Prosím vyčkejte než bude příkaz odeslán..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Prosím čekejte..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Tento kontakt neobsahuje žádné příkazy."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Popis</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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í"
+msgstr ""
+"<b>POZNÁMKA:</b> Měl(a) by jste restartovat gajim, aby se projevila všechna "
+"nastavení"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Editor rozšířeného nastavení"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Smazat MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Smaže zprávu dne"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Upravit kontrolu soukromí..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 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/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Nastavit MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Nastaví Zprávu dne"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Zobrazit _XML konzoli"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Upravit MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Upraví Zprávu dne"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Správce"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "Ode_slat zprávu serveru"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Akce</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Podmínky</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Zvuky</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Pokročilé akce"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Pokročilá správa upozorňování"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Všechny stavy"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101
-#: ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Pryč"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Nerušit"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../data/gui/advanced_notifications_window.ui.h:13
+#, fuzzy
+msgid "File Transfer Finished"
+msgstr "Přenosy souborů"
+
+#: ../data/gui/advanced_notifications_window.ui.h:14
+#, fuzzy
+msgid "File Transfer Request "
+msgstr "Žádost o přenos souboru"
+
+#: ../data/gui/advanced_notifications_window.ui.h:15
+#, fuzzy
+msgid "File Transfer Started "
+msgstr "Přenos souboru zastaven"
+
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Neviditelný"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Provést příkaz"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Nedostupný"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Jeden nebo více zvláštních stavů..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Připojen / Ukecaný"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Přehrát zvuk"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Obdržet zprávu \n"
-"Kontakt odpojen \n"
-"Kontakt změnil stav \n"
-"Zvýraznění zprávy z diskuze \n"
-"Obdržení zprávy z diskuze \n"
-"Žádost o přenos souboru \n"
-"Začátek přenosu souboru \n"
-"Ukončení přenosu souboru"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.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: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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Vypnout automatické otevírání okna rozhovoru"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Vypnout vyskakování existujících oken"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../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/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Vypnout zobrazování události v rosteru"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Vypnout zobrazování události vy systrayi"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Upozorni mě vyskočením okna"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Otevři okno rozhovoru s uživatelem"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Zobrazit událost v rosteru"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Zobrazit událost v systrayi"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "a já"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kontakty\n"
-"skupiny\n"
-"všichni"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "pro"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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 "
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Položka:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Jméno kanálu:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Naposledy upraveno:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Přijat nový záznam"
 
-#: ../data/glade/atom_entry_window.glade.h:5
-#: ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Dostal(a) jste novou položku: "
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blokované Kontakty"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Zpráva:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Nastavit Činnosti"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Nastavit činnost"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Zpráva:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Nálada:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Zadejte znovu pro ověření:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Zadejte heslo:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
-#: ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Činnost:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
-#: ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Nálada:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Uložené stavy:"
 
 # FIXME: not accurate
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Uložit stav..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Vstoupit do _Diskuze"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "č."
+
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "Přid_at do Seznamu"
+#: ../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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopírovat JID/Emailovou adresu"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopírovat odkaz"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Otevři Emailový editor"
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otevřít v prohlížeči"
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Začít rozhovor"
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "Ode_slat"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "_Pozvat do"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Pozvat přátele !"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "MUC server"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Prosím, vyberte MUC server."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1029,272 +951,261 @@ msgstr ""
 "Začátek Více-uživatelského rozhovoru.\n"
 "Vyberte kontakty, které chcete pozvat"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Přidat zvláštní _upozornění"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Přiřadit Open_PGP Klíč..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "P_rovést příkaz..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Upravit _skupiny"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "_Pozvat do"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Pozvat kontakt"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "Odst_ranit"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9
-#: ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Poslat vlastní stav"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Odeslat jednoduchou _zprávu..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Odeslat _Soubor"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Nastavit vlastní Avatar"
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Začít _rozhovor"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Přepnout šifrování mezi uživateli"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Přepnout Open_PGP šifrování"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "Přid_at do Seznamu"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Dovol kontaktu vidět můj stav"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370
-#: ../src/roster_window.py:5501
+#: ../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 "_Blokovat"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Zakaž mu/jí vidět můj stav"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21
-#: ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historie"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignorovat"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Spravovat kontakt"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Přejmenovat"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Autorizace"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364
-#: ../src/roster_window.py:5498
+#: ../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 "_Odblokovat"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Neignorovat"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Vyplňte formulář."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Nastavení místnosti"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Upravit skupiny"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESession</b> informace)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Kontroluj"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Vlastnosti serveru"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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ů"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Zrušit přenos souboru"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Zruší vybraný přenos souboru"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Vymazat"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Přenosy souborů"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Skryje okno"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Odstranit přenos souboru ze výpisu."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:10
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.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"
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Pokračovat"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozornit mě po dokončení přenosu souboru"
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Otevřít obsahující složku"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "výpis přenosů souborů"
 
 # FIXME: better czech translation
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../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/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Řádek účtu\n"
-"Řádek skupiny\n"
-"Řádek kontaktu\n"
-"Nadpis rozhovoru"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Účet"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
-#: ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Tučné"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../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"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Styly písma:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Úprava témat Gajimu"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Pryč"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
-#: ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Skupina"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktivní"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
-#: ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Latinka"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1303,7 +1214,7 @@ msgstr ""
 "z MUC"
 
 # FIXME: I dont really know what this is and where it is
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1311,1469 +1222,1540 @@ msgstr ""
 "MUC Directed\n"
 "Messages"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pozastaveno"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Barva textu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Písmo textu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Pozadí:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Změ_nit přezdívku"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Změnit _předmět"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Nastavit _místnost"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4
-#: ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Záložky"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Zničit místnost"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "Spravuj Místnost"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimalizovat při zavření"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derátor"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "_Akce účastníků"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Odeslat _Soubor"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Přid_at do Seznamu"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Správce"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Zakázat"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "Vy_kopnout"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "Č_len"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Odeslat soukromou zprávu"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Hlas"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Vytvoř nový zápis"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Odesílatel"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Předmět"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 msgid ""
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<b>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."
+"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/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4
-#: ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Smazat"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Export"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajimův Správce Historie"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
+"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/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Hledat v databázi"
 
-#: ../data/glade/history_window.glade.h:1
-#: ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Zadej JID nebo jméno kontaktu\n"
-"Historie diskuzí\n"
-"Historie všech rozhovorů"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Jméno kontaktu"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Diskuze"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Najít:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Přidat tuto místnost do záložek"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Prohlížet"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
-#: ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Přezdívka:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Nedávno:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9
-#: ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+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"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Vstoupit"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Spravovat účty"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Automaticky vstoupit"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Spravovat záložky"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimalizovat po připojení"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Vypiš stav:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
-#: ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Titul:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Nastavení PEP služby"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Nastavit"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Vlastnosti</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Nastavení</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Spravovat profily Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "P_očítač Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "_Port Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Použij HTTP prox_y"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Použít při_hlášení k proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Jméno: "
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Uživatel:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Přidat kontakt do Seznamu (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Přidat tuto místnost do záložek"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Procházet historii diskuze (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Změnit téma místnosti (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Změ_nit přezdívku"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Pozvat kontakty k rozhovoru (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Poslat soubor (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Zobraz seznam smajlíků (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Zobrazit seznam formátování"
-
-#: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Zobrazit nabídku rozšířených funkcí (Alt+D)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Zobrazit profil kontaktu (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr "Přepnout audio"
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "Ode_slat"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor rozšířeného nastavení</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikace</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Akce</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatický Stav</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Vzhled diskuze</b>"
 
 # FIXME: better czech translation -co takhle?
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Barvy Řádků V Diskuzi</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Vizuální upozornění</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Podmínky</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Vlastní</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Písmo</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Volby GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Přednastavené stavy</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Soukromí</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Vzhled Rosteru</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Přednastavené stavy</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Témata</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Prostřední:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizuální upozornění</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Rozšířené..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Všechny stavy rozhovoru\n"
-"Pouze píšu zprávu\n"
-"Vypnuto"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Všechny stavy"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Povolit odeslání informace o _OS"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Povolit odeslání informace o _OS"
+
+#: ../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ý"
+msgstr ""
+"Povolit popup/upozornění pokud jsem _pryč/nedostupný/nerušit/neviditelný"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Povolit zvuk, když jsem zaneprázněn"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Pryč"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Vždy použít OS/X výchozí aplikace"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Vždy použít OS/X výchozí aplikace"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Vždy použít OS/X výchozí aplikace"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Ptej se na stav při:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr "Audio / Video"
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"Automaticky zjistit při každém startu aplikace\n"
-"Vždy použít výchozí aplikace z GNOME\n"
-"Vždy použít výchozí aplikace z KDE\n"
-"Vždy použít výchozí aplikace z Xfce\n"
-"Vlastní"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "_Připojit po startu Gajimu"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Zpráva diskuze:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 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/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Píšu zprávu"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Nastav barvu a písmo uživatelského rozhraní"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Contact's message:"
 msgstr "Zpráva kontaktu:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Contact's nickname:"
 msgstr "Přezdívka kontaktu:"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Vlastní"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
 msgstr ""
-"Samostatný roster a samostatná okna pro diskuze\n"
-"Samostatný roster s jedním diskuzním oknem\n"
-"Samostatné okno pro všechno\n"
-"Samostatný roster a samostatná okna pro diskuze pro každý účet\n"
-"Samostatný roster s diskuzními okny podle typu"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Vypnuto"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Zobrazovat čin_nosti kontaktů v seznamu"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Zobraz _podrobnosti emailu"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Zobrazovat _nálady kontaktů v seznamu"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Zobrazovat _hudbu kontaktů v seznamu"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Zobrazovat a_vatary kontaktů v seznamu"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Zobrazovat _nálady kontaktů v seznamu"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Zobrazovat p_opis stavu kontaktů v Seznamu"
 
-#: ../data/glade/preferences_window.glade.h:49
-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:58
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim 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/glade/preferences_window.glade.h:50
-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:59
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim 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/glade/preferences_window.glade.h:51
-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:60
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém "
+"dolním rohu obrazovky"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../data/glade/preferences_window.glade.h:54
-msgid "If checked, Gajim will allow others to detect the operation system you are using"
+#: ../data/gui/preferences_window.ui.h:63
+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/glade/preferences_window.glade.h:55
-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"
+#: ../data/gui/preferences_window.ui.h:64
+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"
 
-#: ../data/glade/preferences_window.glade.h:56
-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:65
+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/glade/preferences_window.glade.h:57
-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:66
+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/glade/preferences_window.glade.h:58
-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:67
+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/glade/preferences_window.glade.h:59
-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:68
+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/glade/preferences_window.glade.h:60
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v diskuzích"
+#: ../data/gui/preferences_window.ui.h:69
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
+"diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:61
-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:70
+#, 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"
 
-#: ../data/glade/preferences_window.glade.h:62
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v diskuzích"
+#: ../data/gui/preferences_window.ui.h:71
+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/glade/preferences_window.glade.h:63
-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:72
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu a v "
+"diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:64
-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: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 ""
+"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/glade/preferences_window.glade.h:65
-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: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 ""
+"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/glade/preferences_window.glade.h:66
-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:75
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"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/glade/preferences_window.glade.h:67
-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:76
+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/glade/preferences_window.glade.h:68
-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: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 ""
+"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/glade/preferences_window.glade.h:69
-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:78
+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/glade/preferences_window.glade.h:70
+#: ../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 ""
+"Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
+"animované nebo statické grafické smajlíky"
+
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Logovat šifrované rozhovory"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Udělej o_kna zpráv kompaktní"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Sp_ravovat..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Nikdy\n"
-"Pouze při čekajících událostech\n"
-"Vždy"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Server"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Upozornění"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Upozorni mě na kontakty které se přihlásí"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Upozorni mě na kontakty které se odhlásí"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Upozorni mě na kontakty které se odhlásí"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Upozorni při novém _GMail emailu"
 
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nikdy\n"
+"Pouze při čekajících událostech\n"
+"Vždy"
+
 # FIXME: snad je to ok?
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Moje události"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
 msgstr ""
-"Upozorni mě aktivací okna\n"
-"Upozorni mě\n"
-"Zobrazit pouze v rosteru"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Nastavení"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "_Zobrazit událost v rosteru"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Zobraz oznamovací oblast:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../data/glade/preferences_window.glade.h:89
-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:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Některé zprávy mohou obsahovat formátování (odsazení, barvy aj.). Pokud je "
+"zaškrtnuto, Gajim zobrazí pouze čistý text."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Seřadit podle stavu"
 
-#: ../data/glade/preferences_window.glade.h:91
-#: ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Stav"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Výchozí _ikony stavů:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Téma:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
-"The auto away status message. If empty, Gajim will not change the current status message\n"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 msgstr ""
-"Popis stavu automatického stavu 'Pryč'. Pokud je prázdná, tak Gajim nezmění současný popis stavu\n"
+"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/glade/preferences_window.glade.h:98
+#: ../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"
+"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"
+"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/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Používat ikony _transportů"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Použij nastavení _systému"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Když je přijata nová zpráva"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your message:"
 msgstr "Vaše zpráva:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 msgid "Your nickname:"
 msgstr "Vaše přezdívka:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Automaticky pryč po:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "Zobrazovat _události stavu rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Smajlíky:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Správce souborů:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoruj formátování v příchozích zprávách"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "E-_mailový klient:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "Automaticky _nedostupný po:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Otevřít..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Vrátit k výchozím barvám"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "Zobrazovat _události stavu rozhovoru:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Stav:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "Zvýraznění _URL:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "Chování _okna"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "v _diskuzích"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "v _rosteru"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutách"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Nastavení Soukromí:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Přidej / Uprav pravidlo</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Seznam pravidel</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Nastavení Soukromí</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktivní pro toto sezení"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktivní při každém startu"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Vše"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Všechno (včetně autorizací)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Povolit"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Pořadí:"
 
-#: ../data/glade/privacy_list_window.glade.h:12
-#: ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Nastavení Soukromí"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "všechny podle autorizace"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "všem ve skupině"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"žádná\n"
-"oboustranná\n"
-"ode mě\n"
-"ke mě"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Oboustranná"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Odesílatel"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "jeden"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "dva"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "odeslat zprávu"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "pro zaslání dotazu"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "Požádat o zobrazení je(jí)ho stavu"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "Dovol mu/jí vidět můj stav"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresa</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Birthday:</b>"
 msgstr "<b>Narozeniny:</b>"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../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/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../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/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../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/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../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/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../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/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Celé jméno:</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../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/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../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>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../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/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../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/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../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/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Pozice:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>PSČ:</b>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../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/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
-#: ../src/vcard.py:332
+#: ../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>Postavení:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../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/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Ulice:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../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>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Komentář"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Klikni pro nastavení tvého avatara"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Osobní údaje"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Práce"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Odstranit účet _pouze z Gajimu"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Odstranit účet z Gajimu i ze _serveru"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380
-#: ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "Odst_ranit"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
-msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Výměna položky rosteru"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Přid_at Kontakt..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Vlastnosti serveru"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Přenosy souborů"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Často kladené dotazy - FAQ (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Nápověda online"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil, A_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Zobrazit pouze _aktivní kontakty"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Zobrazuj trans_porty"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Zobrazit _Seznam"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "Úč_ty"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Akce"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Obsah"
-
-#: ../data/glade/roster_window.glade.h:18
-#: ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Úpravy"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Nastavení"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Konec"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Odeslat jednoduchou _zprávu..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Zobraz"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../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/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Najít"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Přidat _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4
-#: ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "Informace o kontaktu"
 
-#: ../data/glade/search_window.glade.h:5
-#: ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Najít"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Jdi"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Zaregistrovat"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Odpovědět na tuto zprávu"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "O_deslat"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Odeslat zprávu"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Odeslat zprávu a zavřít okno"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Příjemce:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Ode_slat a zavřít"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_torizuj"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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ý(á)"
 
-#: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
+#: ../data/gui/subscription_request_window.ui.h:3
+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/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Žádost o autorizaci"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "O_dmítnout"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Vybrat účet pro synchronizaci"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronizace: vybrat kontakty"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Vypnout zvuky"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Odeslat jednoduchou _zprávu"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Zobrazit všechny čekající _události"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "S_tav"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Diskuze"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Žádá:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Čas kontaktu:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Zdroj:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Stav:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Autorizace:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Systému:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Vlastní poznámky"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Nastavit avatara"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Informace o kontaktu"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Více"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Avatar:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Písmo</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Provoz Jabberu</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Vstup XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Povolit"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:9
 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Stav"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "Upravit úč_et..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lokální jid: "
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Osobní"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber klient"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Zrušit ověření"
 
-#: ../src/adhoc_commands.py:296
-msgid "You are in process of executing command. Do you really want to cancel it?"
+#: ../src/adhoc_commands.py:299
+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:328
-#: ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Služba odeslala chybné data"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Služba změnila identifikátor sezení."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Služba vrátila chybu."
 
@@ -2798,8 +2780,7 @@ msgstr "Číslo"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96
-#: ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Barva"
 
@@ -2937,144 +2918,135 @@ msgstr "Švédština"
 msgid "Chinese (Ch)"
 msgstr "Čínština"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Kontrola jazyka"
 
 #. we are not connected
-#: ../src/chat_control.py:478
-#: ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/chat_control.py:479
-#: ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Podtrhnout"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Přeškrtnout"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Smazat formátování"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Opravdu odeslat soubor?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411
-#: ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG Šifrování zapnuto"
 
 #. Add to roster
-#: ../src/chat_control.py:1436
-#: ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253
-#: ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060
-#: ../src/dialogs.py:1973
-#: ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610
-#: ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398
-#: ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578
-#: ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194
-#: ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Není v Rosteru"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Tento kontakt nepodporuje přenos souborů."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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:1555
+#: ../src/chat_control.py:1611
 #, 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:1720
+#: ../src/chat_control.py:1812
 #, 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:1844
-#: ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Nepřiřazen GPG klíč"
 
-#: ../src/chat_control.py:1845
-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:1928
+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:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG Šifrování vypnuto"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Sezení BUDE logováno"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Sezení NEBUDE logováno"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "NENÍ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "NEBUDE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "a autentizovaný"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3083,176 +3055,184 @@ msgstr ""
 "Šifrování %(type)s %(status)s aktivní %(authenticated)s.\n"
 "Váš rozhovor %(logged)s zaznamenáván."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Sezení bylo zrušeno"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Toto sezení je šifrované"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr "a BUDE zaznamenáváno"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr "a NEBUDE zaznamenáváno"
 
-#: ../src/chat_control.py:2074
-msgid "Remote contact's identity not verified. Click the shield button for more details."
+#: ../src/chat_control.py:2158
+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:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E Šifrování vypnuto"
 
-#: ../src/chat_control.py:2113
-#: ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Následující zpráva NEBYLA šifrovaná"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, 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:2389
-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:2542
-#: ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483
-#: ../src/common/connection.py:420
-#: ../src/gajim.py:154
-#: ../src/session.py:134
+#: ../src/chat_control.py:2476
+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: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
 msgid "Database Error"
 msgstr "Chyba Databáze"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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 ""
+"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:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je nyní %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
-#: ../src/common/check_paths.py:129
-#: ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "vytvářím databázi historie"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130
-#: ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148
-#: ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Informace o změně stavu"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Změnit stav"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Nastav typ přítomnosti a popisek"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Ukecaný"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Připojen"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Dlouho pryč"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Nerušit"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Odpojený - odpojit"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Popis stavu: "
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Stav se změnil."
 
-#: ../src/common/commands.py:176
-#: ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Opustit diskuzi"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s v %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Nepřipojil jsi se k diskuzi."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205
-#: ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55
-#: ../src/roster_window.py:809
-#: ../src/roster_window.py:1580
-#: ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Diskuze"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Opustil(a) jste následující diskuze:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Přeposlat nepřečtené zprávy"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Všechny nepřečtené zprávy byly přeposlány."
 
@@ -3296,7 +3276,9 @@ msgstr "$S bude změněn na aktuální stav, čas: $T"
 
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
-msgstr "Kdy zobrazit ikonu v oznamovací oblasti. Může být jedno z nikdy='never', při události='on_event', vždy='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
 msgid "Incoming nickname color."
@@ -3339,16 +3321,15 @@ 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é\"."
+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:482
-#: ../src/common/optparser.py:288
-#: ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499
-#: ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "výchozí"
 
@@ -3367,32 +3348,62 @@ msgstr ""
 "'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'."
+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
 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."
+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)"
+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: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."
+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: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."
+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: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"
+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:160
 msgid "Characters that are printed before the nickname in conversations"
@@ -3407,8 +3418,12 @@ msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
 #: ../src/common/config.py:166
-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."
+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:167
 msgid "How many minutes should last lines from previous conversation last."
@@ -3423,12 +3438,20 @@ msgid "How many minutes back to request logs when a entering a groupchat."
 msgstr "Kolik minut zpátky do historie při připojení k diskuzi."
 
 #: ../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."
-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í."
+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:172
-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)."
+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:174
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -3436,48 +3459,89 @@ msgstr "Kolik řádků uložit pro Ctrl+Šipka nahoru."
 
 #: ../src/common/config.py:177
 #, 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:180
 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: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."
-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í."
+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:182
-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á."
+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:183
-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."
+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:185
-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."
+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:186
 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:187
-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í."
+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:188
-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í."
+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: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)"
-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)"
+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: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."
-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ů."
+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:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -3500,515 +3564,689 @@ msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
 #: ../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."
-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í."
+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:214
 msgid "Preview new messages in notification popup?"
 msgstr "Zobrazit náhled nové zprávy ve vyskakovacím okně?"
 
 #: ../src/common/config.py:219
-msgid "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 "Středníkem oddělený seznam slov, které budou zvýrazněny v diskuzích."
 
 #: ../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."
-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 trayicon 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:221
-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."
+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:222
-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á."
+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:223
-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."
+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:228
+#: ../src/common/config.py:229
 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:229
-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:230
-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."
+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:231
-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."
+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:233
+#: ../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."
+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:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Barva pozadí kontaktů, jež se zrovna přihlásili."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Barva pozadí kontaktů, jež se přávě odhlásili."
 
-#: ../src/common/config.py:236
-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:237
+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:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Nezobrazuj avatara pro transport samotný."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Nezobrazuj roster v liště úloh."
 
-#: ../src/common/config.py:239
-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: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."
+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:241
-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: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."
+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:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window along with the roster.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window."
 msgstr ""
 "Ří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:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Skryje tlačítka v okně diskuze."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Skryje nadpis v okně diskuze"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Skryje nadpis v okně rozhovoru dvou lidí"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skryje seznam lidí místnosti v okně diskuze."
 
-#: ../src/common/config.py:251
-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: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."
+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:252
+#: ../src/common/config.py:253
 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:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Jemné posouvání v okně diskuze"
 
-#: ../src/common/config.py:254
-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:255
-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á."
+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:256
-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."
+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:257
-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."
+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:258
-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."
+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:259
-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."
+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:260
-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."
+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:261
-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ů."
+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:262
-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."
+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:263
-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"
+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:264
-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é."
+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:265
-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 ""
+"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:266
-msgid "Time of inactivity needed before the change status window closes down."
-msgstr "Čas neaktivity před zavřením okna změny stavu."
+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:267
-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."
+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:268
-msgid "If True, notification windows from notification-daemon will be attached to systray icon."
-msgstr "Je-li povoleno, Upozorňovací démon přidá upozornění do systémové lišty."
+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:269
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Vyberte interval mezi dvěma stavy nečinnosti."
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+"Je-li povoleno, Upozorňovací démon přidá upozornění do systémové lišty."
 
 #: ../src/common/config.py:270
-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 "Choose interval between 2 checks of idleness."
+msgstr "Vyberte interval mezi dvěma stavy nečinnosti."
 
 #: ../src/common/config.py:271
-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ášť)"
+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:272
-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!"
+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:273
-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"
+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:274
-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\""
+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"
 
-#: ../src/common/config.py:286
-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:275
+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:294
-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: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."
+msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
+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: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"
+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:305
 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:297
-msgid "If True, Contacts requesting authorization will be automatically accepted."
+#: ../src/common/config.py:307
+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:298
-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:308
+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:301
-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:311
+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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Povolit ESessions šifrování pro tento účet."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 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:305
-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:315
+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:306
-msgid "Show a warning dialog before sending password on an plaintext connection."
+#: ../src/common/config.py:316
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
 msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 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:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr "Zobrazit varování před odesláním hesla přes nezabezpečené spojení."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mezerami oddělovaný seznam ssl chyb, které se mají ignorovat."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Při neaktivitě odeslán bílý znak"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping zaslán při neaktivitě"
 
-#: ../src/common/config.py:323
-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:334
+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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:330
-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:341
+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:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Odpověď na doručení žádosti"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Poslat žádost"
 
-#: ../src/common/config.py:353
-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:366
+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:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je OpenPGP povoleno pro tento kontakt?"
 
-#: ../src/common/config.py:417
-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:432
+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:418
-#: ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Jazyk, pro který chcete kontrolovat překlepy ve slovech"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "všechny nebo mezerou oddělené stavy"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', nebo 'both'"
 
-#: ../src/common/config.py:429
-#: ../src/common/config.py:431
-#: ../src/common/config.py:432
-#: ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' nebo ''"
 
-#: ../src/common/config.py:442
-#: ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:444
-#: ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:446
-#: ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Užívám si života venku."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Jsem dostupný."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Hledám někoho na pokec."
 
-#: ../src/common/config.py:461
-#: ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Hned jsem zpět."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Nejsem dostupný."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Nerušit."
 
-#: ../src/common/config.py:464
-#: ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Zdar!"
 
-#: ../src/common/config.py:475
-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: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."
+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:476
+#: ../src/common/config.py:491
 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:485
-#: ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:489
-#: ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nelze nahrát idle modul"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Nesprávné jméno počítače"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Neplatná místní adresa? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrační informace pro transport %s nedorazily včas"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registrace úspěšná"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrace k agentu %s uspěla"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Registrace selhala"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, 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:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481
-#: ../src/common/connection.py:418
-#: ../src/gajim.py:354
+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: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
 msgid "Disk Write Error"
 msgstr "Chyba zápisu na disk (možná je plný?)"
 
-#: ../src/common/connection_handlers.py:1225
-#: ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Neviditelnost není podporována"
 
-#: ../src/common/connection_handlers.py:1226
-#: ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditelnost."
 
-#: ../src/common/connection_handlers.py:1919
-#: ../src/common/connection.py:233
-#: ../src/config.py:1940
-#: ../src/config.py:1949
-#: ../src/config.py:2008
-#: ../src/config.py:3360
-#: ../src/dataforms_widget.py:577
-#: ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 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:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484
-#: ../src/common/connection.py:421
-#: ../src/gajim.py:155
-#: ../src/session.py:135
+#: ../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)."
-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)."
+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:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Přezdívka nepovolena: %s"
@@ -4016,80 +4254,83 @@ msgstr "Přezdívka nepovolena: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310
-#: ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Nelze se připojit se do diskuze"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "V %s byl dosažen maximální počet uživatelů"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Máš zakázán přístup do diskuze %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskuze %s neexistuje."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Vytváření místností není povoleno."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Musí být použita přezdívka, jež máte zaregistrovánu v diskuzi %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nejsi v seznamu členů diskuze %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Místnost byla zničena"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Můžete se připojit do této místnosti: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "jsme nyní zapsáni k %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Žádost o zrušení autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "byla nám zrušena autorizace od %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, 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í"
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"JID %s neodpovídá RFC. Nebude přidáno do tvého rosteru. Použij nástroje pro "
+"správu rosteru jako je http://jru.jabberstudio.org/ k jeho odstranění"
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4219,29 +4460,28 @@ msgstr "Použítý klíč neobsahuje podpis certifikátu"
 msgid "Application verification failure"
 msgstr "Ověřování aplikace skončilo neúspěchem"
 
-#: ../src/common/connection.py:234
-#: ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 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:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tato zpráva je *zašifrovaná* (Viz :XEP:\"27\")]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4250,80 +4490,76 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Znovu připojit ručně."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytnul rozdílný registrační formulář"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznámá SSL chyba: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Neplatná odpověď"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075
-#: ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:1076
-#: ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server odpověděl: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Spojení s proxy selhalo"
 
-#: ../src/common/connection.py:1125
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Selhalo připojení k účti %s"
 
-#: ../src/common/connection.py:1126
-#: ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Autentizace certifikátu %s je neplatná."
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4332,7 +4568,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4341,73 +4577,69 @@ msgstr ""
 "\n"
 "Neznámá SSL chyba: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Chyba při odebírání privacy listu"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Odeslán kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Odeslány kontakty:"
 
-#: ../src/common/connection.py:1703
-#: ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Nestáhnuto z důvodu stavu neviditelnosti"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Odregistrace selhala"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, 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:129
-#: ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Přihlížející"
 
-#: ../src/common/contacts.py:133
-#: ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55
-#: ../src/disco.py:119
-#: ../src/disco.py:120
-#: ../src/disco.py:1464
-#: ../src/gui_interface.py:413
-#: ../src/roster_window.py:848
-#: ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572
-#: ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Není v rosteru"
 
@@ -4416,36 +4648,51 @@ msgstr "Není v rosteru"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "na tomto stroji neběží D-Bus korektně"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Závislost na pysqlite2 (neboli python-pysqlite2) není splněna. Končím..."
+#: ../src/common/dbus_support.py:54
+#, 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/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "na tomto stroji neběží D-Bus korektně"
+
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Nemohu číst z databáze."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 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:63
+#: ../src/common/exceptions.py:67
 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í"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Session bus není k dispozici.\n"
+"Zkuste přečíst http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Session bus není k dispozici.\n"
 "Zkuste přečíst http://trac.gajim.org/wiki/GajimDBus"
@@ -4565,8 +4812,7 @@ msgstr "za pět %(1)s"
 msgid "%(1)s o'clock"
 msgstr "%(1)s hodin"
 
-#: ../src/common/fuzzyclock.py:49
-#: ../src/common/fuzzyclock.py:51
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Noc"
 
@@ -4602,8 +4848,7 @@ msgstr "Pozdě večer"
 msgid "Start of week"
 msgstr "Začátek týdne"
 
-#: ../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 "Uprostřed týdne"
 
@@ -4615,208 +4860,206 @@ msgstr "Konec týdne"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Neplatný znak v uživatelském jméně."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Je potřeba adresa serveru."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Neplatný znak v hostname."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Neplatný znak ve zdroji."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Nerušit"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Nerušit"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "Ne_dostupný"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Ukecaný"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Ukecaný"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "Přip_ojen"
 
-#: ../src/common/helpers.py:212
-#: ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Připojen"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Připojuji se"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Pryč"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Odpojen"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Odpojen"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "Ne_viditelný"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "stav"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Žádná"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Příjemce"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Oboustranná"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Není"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Žádat autorizaci"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Žádná"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderátoři"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Návštěvníci"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Návštěvník"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Žádná"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Správce"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "věnuje pozornost rozhovoru"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "dělá něco jiného"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "pozastavil(a) psaní zprávy"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "zavřel(a) okno zprávy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049
-#: ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4824,24 +5067,22 @@ msgstr[0] "Čeká %d zpráva"
 msgstr[1] "Čekají %d zprávy"
 msgstr[2] "Čeká %d zpráv"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr "z místností %s"
 
-#: ../src/common/helpers.py:1065
-#: ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr "od uživatele %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1074
-#: ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4849,12 +5090,49 @@ msgstr[0] "Čeká %d událost"
 msgstr[1] "Čekají %d události"
 msgstr[2] "Čeká %d událostí"
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Nastavení místnosti"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../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"
@@ -4864,18 +5142,75 @@ msgstr "chyba při spouštění \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s není platný loglevel"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Výchozí Zpráva"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+#, fuzzy
+msgid "Audio test"
+msgstr "Audio / Video"
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Velikost: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/common/optparser.py:297
-#: ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "azurová"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "převádím záznamy historie k použítí indexů"
 
@@ -5305,8 +5640,7 @@ msgstr "Obědvám"
 msgid "Exercising"
 msgstr "Cvičím"
 
-#: ../src/common/pep.py:133
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Jedu na kole"
 
@@ -5527,19 +5861,19 @@ msgstr "Učím se"
 msgid "Writing"
 msgstr "Píši"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Neznámý Umělec"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Neznámý Název"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Neznámý Zdroj"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5549,19 +5883,25 @@ msgstr ""
 "z <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:91
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Nemohu naslouchat na portu %s."
 
-#: ../src/common/socks5.py:87
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
+#: ../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:301
-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:303
+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:178
 msgid "Avahi error"
@@ -5614,7 +5954,8 @@ 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:359
-msgid "Connection to host could not be established: Timeout while sending data."
+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
@@ -5623,250 +5964,232 @@ 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:157
-#: ../src/config.py:586
-msgid "Disabled"
-msgstr "Vypnuto"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Výchozí Zpráva"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Povolit"
 
-#: ../src/config.py:654
-#: ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Slovník pro jazyk %s není dostupný"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, 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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "text stavu"
 
 #. Name column
-#: ../src/config.py:1394
-#: ../src/dialogs.py:2232
-#: ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014
-#: ../src/disco.py:831
-#: ../src/disco.py:1690
-#: ../src/disco.py:1992
-#: ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Připojit se teď znovu?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620
-#: ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP na tomto počítači není použitelné"
 
-#: ../src/config.py:1785
-#: ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Nepřečtené zprávy"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 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:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otevřel(a) jsi rozhovor z účtu %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825
-#: ../src/config.py:2348
-#: ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Jméno účtu už existuje"
 
-#: ../src/config.py:1837
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:1942
+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:1841
-#: ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Přejmenovat účet"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadej nové jméno pro účet %s."
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 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:2158
-#: ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:2159
-#: ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Není dostupný tajný klíč OpenPGP."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Výběr OpenPGP klíče"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231
-#: ../src/dialogs.py:2031
-#: ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405
-#: ../src/disco.py:477
-#: ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Váš server nepodporuje vizitky."
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Váš server neumí uložit Vaše osobní informace."
 
-#: ../src/config.py:2349
-#: ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "Chcete-li deaktivovat účet, musíte se nejdříve odpojit."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Seznam členů"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Seznam vlastníků"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Seznam správců"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600
-#: ../src/disco.py:838
-#: ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Důvod"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Přezdívka"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Postavení"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Zakazuji..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5874,37 +6197,37 @@ msgstr ""
 "<b>Koho chcete zakázat?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Přidávám člena..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 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:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Přidávám vlastníka..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 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:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Přidávám správce..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 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:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5920,124 +6243,150 @@ 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:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2785
-#: ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Smajlíci byly vypnuty"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2786
-#: ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2787
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Spojení s proxy selhalo"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Co by jste rád(a) dělal(a)?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Odstranit účet _pouze z Gajimu"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Výchozí"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Všechny"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Pouze při vstupu a výstupu"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Žádný"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Nová diskuze"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:3001
-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:3129
+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:3119
-#: ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3120
-#: ../src/config.py:3134
-#: ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Znak nebyl povolen"
 
-#: ../src/config.py:3133
-#: ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Neplatná místnost"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:3300
-#: ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, 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:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 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:3383
+#: ../src/config.py:3525
 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:3439
-#: ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Certifikát je již v souboru"
 
-#: ../src/config.py:3440
-#: ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6052,8 +6401,7 @@ msgstr ""
 "SSL Chyba: %(error)s\n"
 "Přesto se chcete k serveru připojit?"
 
-#: ../src/config.py:3516
-#: ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6064,60 +6412,59 @@ msgstr ""
 "SHA1 otisk certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3543
-#: ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "První zpráva přijata"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Další zpráva přijata zvýrazněná"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Další zpráva přijata nezvýrazněná"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt se připojil"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt se odpojil"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Zpráva odeslána"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznění zprávy v diskuzi"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Přijetí zprávy v diskuzi"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Přišel GMail Email"
 
@@ -6139,45 +6486,45 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno \n"
 "po posledním čtení této diskuze"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Konec"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Otevřít jako _Odkaz"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6186,8 +6533,7 @@ msgstr[1] "před %i dny"
 msgstr[2] "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330
-#: ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
@@ -6205,8 +6551,7 @@ msgstr "Jabber ID je již na seznamu. Vyberte jiné."
 msgid "new@jabber.id"
 msgstr "new@jabber.id"
 
-#: ../src/dataforms_widget.py:596
-#: ../src/dataforms_widget.py:598
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "new%d@jabber.id"
@@ -6255,7 +6600,8 @@ msgid "Overwrite Status Message?"
 msgstr "Přepsat Text stavu?"
 
 #: ../src/dialogs.py:794
-msgid "This name is already used. Do you want to overwrite this status message?"
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
 msgstr "Toto jméno je již použito. Chcete přepsat text stavu?"
 
 #: ../src/dialogs.py:802
@@ -6291,529 +6637,500 @@ msgstr "Yahoo! adresa:"
 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:874
+#: ../src/dialogs.py:875
 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:1035
-#: ../src/dialogs.py:1041
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Neplatný identifikátor uživatele"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "User ID nesmí obsahovat zdroj."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakt už je v Seznamu"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ verze: "
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK verze: "
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Aktivní vývojáři:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Vysloužilí vývojáři:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "DÍKY:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Petr Menšík <pihhan@seznam.cz>\n"
 "scippio <scippio@berounet.cz>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, 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:1830
-#: ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:2026
-#: ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Neplatný účtu"
 
-#: ../src/dialogs.py:2161
-msgid "You have to choose an account from which you want to join the groupchat."
+#: ../src/dialogs.py:2301
+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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/dialogs.py:2175
-#: ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Neplatné Jabber ID diskuzní místnosti"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 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:2182
-#: ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID diskuze obsahuje nepřijatelné znaky."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Tohle není diskuze"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s není jméno diskuze."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Tento účet není připojen k serveru"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Nemůžete synchronyzovat účet pokud nění připojen."
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Synchronizovat"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 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:2384
-#: ../src/dialogs.py:2767
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:2385
-#: ../src/dialogs.py:2768
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, 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:2394
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Neplatné JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nemůžu dekódovat \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469
-#: ../src/notify.py:263
-#: ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:2471
-#: ../src/notify.py:271
-#: ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473
-#: ../src/notify.py:294
-#: ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:2473
-#: ../src/notify.py:275
-#: ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
 #. private message
-#: ../src/dialogs.py:2474
-#: ../src/notify.py:282
-#: ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:2474
-#: ../src/gui_interface.py:1315
-#: ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Nový E-mail"
 
-#: ../src/dialogs.py:2476
-#: ../src/gui_interface.py:1382
-#: ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:2478
-#: ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349
-#: ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:2480
-#: ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449
-#: ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:2481
-#: ../src/gui_interface.py:1430
-#: ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:2483
-#: ../src/gui_interface.py:1123
-#: ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Skupinová pozvánka"
 
-#: ../src/dialogs.py:2485
-#: ../src/notify.py:255
-#: ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakt změnil stav"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Přijaté %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Konzole"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 msgid "add"
 msgstr "přidat"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 msgid "modify"
 msgstr "upravit"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 msgid "remove"
 msgstr "odebrat"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, 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."
+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:3003
-#: ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Přidat"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005
-#: ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Upravit"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Smazat"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Skupiny"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, python-format
 msgid "Added  %s contacts"
 msgstr "Přidáno %s kontaktů"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "Odstraněno %s kontaktů"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Soukromý seznam <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Pořadí: %(order)s, akce: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Upravit pravidlo</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Přidat pravidlo</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Soukromý seznam pro %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Soukromý Seznam"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Neplatné jméno seznamu"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 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:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Jste pozván do diskuze"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vás pozval(a) do místnosti %(room_jid)s"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Chcete přijmout pozvání?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:3740
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "č."
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Podmínka"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "když jsem "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6824,209 +7141,229 @@ msgstr ""
 "\n"
 "Krátký Autentizační řetězec pro toto sezení je: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Už jste prověřoval identitu tohoto kontaktu."
 
-#: ../src/dialogs.py:4551
-#: ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Identita kontaktu ověřena"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Ověřit znovu"
 
-#: ../src/dialogs.py:4564
-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: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."
+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:4567
-#: ../src/dialogs.py:4621
-#: ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Identita kontaktu NENÍ ověřena"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Ověřit..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Ověřil(a) jste identitu kontaktu?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, 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:4588
+#: ../src/dialogs.py:4775
 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:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 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."
+msgstr ""
+"Tomuto kontaktu není přiřazen GPG klíč. Proto nemůžete šifrovat zprávy."
 
-#: ../src/dialogs.py:4635
-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: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."
+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:4641
-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:4828
+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:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr "audio a video"
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr "audio"
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr "video"
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, 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:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Ostatní"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Diskuze"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Procházení služeb s použitím účtu %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Tato služba nebyla nalezena"
 
-#: ../src/disco.py:707
-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:744
+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:711
-#: ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Službu nelze prohlížet"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751
-#: ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Neplatné jméno serveru"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Procházím %(address)s pomocí účtu %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Prohlížet"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 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:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "Spustit _příkaz..."
 
-#: ../src/disco.py:1298
-#: ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skenuji %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Popis"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "č."
 
-#: ../src/disco.py:1781
-#: ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Záložky"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavena"
 
-#: ../src/disco.py:1782
-#: ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, 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:1791
-#: ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Záložka byla úspěšně přidána"
 
-#: ../src/disco.py:1792
-#: ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Autorizován"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Uzel"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Nový záznam"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Zrušit autorizaci"
 
@@ -7035,11 +7372,12 @@ msgid "SSL certificat validation"
 msgstr "Validace SSL certifikátu"
 
 #: ../src/features_window.py:49
-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í."
+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:50
-#: ../src/features_window.py:51
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Je potřeba python-pyopenssl."
 
@@ -7049,7 +7387,8 @@ msgstr "Bonjour / Zeroconf"
 
 #: ../src/features_window.py:53
 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:54
 msgid "Requires python-avahi."
@@ -7071,14 +7410,10 @@ msgstr "Skript, který ovládá Gajim z příkazové řádky."
 msgid "Requires python-dbus."
 msgstr "Je potřeba python-dbus."
 
-#: ../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:111
+#: ../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
 msgid "Feature not available under Windows."
 msgstr "Vlastnost není k dispozici pod Windows."
 
@@ -7168,8 +7503,11 @@ msgid "Passive popups notifying for new events."
 msgstr "Pasivní okna oznamující nové události."
 
 #: ../src/features_window.py:86
-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."
+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 "Automatic status"
@@ -7196,12 +7534,20 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Převede LaTeX výraz mezi $$ $$."
 
 #: ../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 "Je potřeba texlive-latex-base a dvipng. Dále musíte nastavit 'use_latex' na True v Editoru rozšířeného nastavení."
+msgid ""
+"Requires texlive-latex-base and dvipng. 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: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 "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 texlive-latex-base and dvipng (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:96
 msgid "End to End message encryption"
@@ -7211,8 +7557,7 @@ msgstr "End to End šifrování zpráv"
 msgid "Encrypting chat messages."
 msgstr "Šifruji zprávy."
 
-#: ../src/features_window.py:98
-#: ../src/features_window.py:99
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Je potřeba python-crypto."
 
@@ -7221,116 +7566,100 @@ msgid "RST Generator"
 msgstr "RST Generátor"
 
 #: ../src/features_window.py:101
-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)."
+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:102
-#: ../src/features_window.py:103
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Je potřeba python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Bannery a klikatelné odkazy"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr "Funkce umožňující mít klikatelné URL odkazy v rozhovoru a předmětu diskuze."
-
-#: ../src/features_window.py:106
-#: ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Je potřeba python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr "Audio / Video"
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr "Schopnost zahájit audio a video rozhovor."
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr "Je potřeba python-farsight."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Vlastnost"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Soubor"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Čas"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Průběh"
 
-#: ../src/filetransfers_window.py:177
-#: ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:178
-#: ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187
-#: ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Vy"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: ../src/filetransfers_window.py:189
-#: ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Příjemce: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Uloženo do: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Přenos soubor dokončen"
 
-#: ../src/filetransfers_window.py:217
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Otevřít obsahující složku"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Přenos souboru zrušen"
 
-#: ../src/filetransfers_window.py:217
-#: ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Příjemce: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Chybová zpráva: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Přenos souboru zastaven"
 
@@ -7338,8 +7667,7 @@ msgstr "Přenos souboru zastaven"
 msgid "Choose File to Send..."
 msgstr "Vyber soubor k odeslání..."
 
-#: ../src/filetransfers_window.py:273
-#: ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Popis:"
 
@@ -7375,37 +7703,33 @@ msgstr "Popis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:342
-#: ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:860
-msgid "A file with this name already exists and you do not have permission to overwrite it."
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
+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:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Tento soubor už existuje"
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Adresář \"%s\" není zapisovatelný"
 
-#: ../src/filetransfers_window.py:369
-#: ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 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."
 
@@ -7429,8 +7753,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585
-#: ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
@@ -7442,79 +7765,70 @@ msgstr "Soubor: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:615
-#: ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Pokračovat"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim vyžaduje k běhu X server. Končím..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "import PyGTK selhal: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim vyžaduje PyGTK 2.12 nebo novější"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim vyžaduje PyGTK 2.12 nebo novější. Končím..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim potřebuje GTK 2.12 nebo novější"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim vyžaduje GTK 2.12 nebo novější. Končím..."
 
-# FIXME: runtime je jak?
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ runtime vyžaduje podporu libglade"
-
-# FIXME: runtime?
-#: ../src/gajim.py:191
-#, python-format
-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"
-
-#: ../src/gajim.py:193
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Ujistěte se prosím, že GTK+ a PyGTK ve Vašem systému podporují libglade."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim vyžaduje PySQLite2"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim potřebuje k běhu pywin32"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, 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:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim již běží"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7544,24 +7858,21 @@ msgid "Pops up a window with the next pending event"
 msgstr "Zobrazí okno s další nepřečtenou událostí"
 
 #: ../src/gajim-remote.py:93
-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: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:271
-#: ../src/gajim-remote.py:282
+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:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "účet"
 
@@ -7583,15 +7894,16 @@ msgid "status"
 msgstr "stav"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
+msgstr ""
+"jeden z: odpojen, připojen, ukecaný, pryč, nedostupný, nerušit, neviditelný "
 
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
-#: ../src/gajim-remote.py:273
+#: ../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"
 
@@ -7600,8 +7912,12 @@ msgid "status message"
 msgstr "text stavu"
 
 #: ../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\" "
+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:117
 msgid "Changes the priority of account or accounts"
@@ -7617,8 +7933,12 @@ 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\" "
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"změnit stav účtu \"account\". Pokud není uveden, zkuste změnit stav všech "
+"účtů které mají povolenu volbu \"sync with global status\" "
 
 #: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
@@ -7628,8 +7948,7 @@ msgstr "Zobrazte okno rozhovoru, aby jste mohl(a) poslat zprávu kontaktu"
 msgid "JID of the contact that you want to chat with"
 msgstr "JID kontaktu, se kterým chcete komunikovat"
 
-#: ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "pokud uvedeno, kontakt bude vzít ze seznamu kontaktů pro tento účet"
 
@@ -7638,39 +7957,46 @@ msgid "message content. The account must be specified or \"\""
 msgstr "obsah zprávy. Účet musí být uveden, nebo prázdné \"\""
 
 #: ../src/gajim-remote.py:139
-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 ''."
+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:143
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID kontaktu, který obdrží zprávu"
 
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
 #: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "Tělo zprávy"
 
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "pgp klíč"
 
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "pokud bude uvedeno, zpráva bude zašifrována tímto veřejným klíčem"
 
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 #: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 
 #: ../src/gajim-remote.py:152
-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 ''."
+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:157
 msgid "subject"
@@ -7692,10 +8018,8 @@ msgstr "JID diskuze do které přijde zpráva"
 msgid "Gets detailed info on a contact"
 msgstr "Získej detailní informace o kontaktu"
 
-#: ../src/gajim-remote.py:177
-#: ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220
-#: ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
@@ -7778,7 +8102,8 @@ 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.py:242
-msgid "Returns current status message (the global one unless account is specified)"
+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:249
@@ -7802,74 +8127,97 @@ msgid "XML to send"
 msgstr "XML k odeslání"
 
 #: ../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ů"
+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: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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsluhovat xmpp:/ uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI k obsluze"
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Obsah zprávy"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "_Vstoupit do místnosti MUC"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "místnost"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID Místnosti"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "přezdívka"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Přezdívka kterou chete použít"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "heslo"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Heslo pro vstup do místnosti"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Zkontrolujte, zda Gajim již běží."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Zobrazí nebo skryje okno ipythonu"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7878,15 +8226,15 @@ msgstr ""
 "'%s' není ve vašem Seznamu.\n"
 "Prosím uveďte účet, přes který bude odeslána zpráva."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Nemáte aktivní účet"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Vypadá to, že Gajim neběží. Proto nemůžete použít gajim-remote"
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7895,16 +8243,16 @@ msgstr ""
 "Použití: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Parametry:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s nebyl nalezen"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -7913,7 +8261,7 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -7922,7 +8270,7 @@ msgstr ""
 "Příliš mnoho parametrů. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -7931,7 +8279,11 @@ msgstr ""
 "Parametr \"%(arg)s\" nebyl uveden. \n"
 "Napište \"%(basename)s help %(command)s\" pro více informací"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Nesprávné uri"
 
@@ -7960,183 +8312,175 @@ msgstr "Nemůžete smazat právě používané téma"
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Odesílání soukromé zprávy selhalo"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Vložit přezdívku"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Rozhovor s"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Pokračování v rozhovoru"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228
-#: ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Každý návštěvník uvidí váš úplný JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Zaznamenávání historie je povoleno"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Nová místnost byla vytvořena"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s byli vyhozeni od %(who)s: %(reason)s"
 
 # FIXME: preklad pro ban? zabanovani je hnusne
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272
-#: ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_control.py:1288
-#: ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326
-#: ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "Příslušnost:"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "nastavení místnosti se změnilo na vstup pouze členům"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "vypnout systém"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s vstoupil do místnosti"
 
-#: ../src/groupchat_control.py:1473
-#: ../src/gui_interface.py:919
-#: ../src/history_window.py:442
-#: ../src/notify.py:250
+#: ../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 je nyní %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1690
+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:1712
-#: ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940
-#: ../src/gui_interface.py:1975
-#: ../src/message_window.py:227
-#: ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301
-#: ../src/roster_window.py:3990
+#: ../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 "Příště _nezobrazovat"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Měním Téma"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Prosím zadejte nové téma:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Měním přezdívku"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Likviduji: %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8144,23 +8488,22 @@ msgstr ""
 "Místnost bude s konečnou platností zničena.\n"
 "Můžete specifikovat důvod zničení:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Také můžete specifikovat náhradní místo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_control.py:1968
-#: ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -8171,130 +8514,130 @@ 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
 msgid "_Report Bug"
 msgstr "_Ohlásit chybu"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detaily"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171
-#: ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim není výchozí Jabber klient"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete nastavit Gajim jako výchozí Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Rozšíření není podporováno"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Uložit obrázek jako..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, 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:132
+#: ../src/gui_interface.py:142
 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:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Chcete přijmout tuto žádost na účtě %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizace pro %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205
-#: ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Spojení selhalo"
 
-#: ../src/gui_interface.py:544
-#: ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558
-#: ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba při odesílání %s ( %s )"
 
-#: ../src/gui_interface.py:599
-#: ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Žádost o autorizaci"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8302,95 +8645,105 @@ msgstr ""
 "Vždy uvidíte jeho nebo ji odpojeného/odpojenou.\n"
 "Opravdu jeho/ji chcete odstrani ze seznamu kontaktů?"
 
-#: ../src/gui_interface.py:663
-#: ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Autorizace zrušena"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, 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:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Místnost nyní zobrazuje nedostupné členy"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "místnost nyní nezobrazuje nedostupné členy"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávání historie je zapnuto"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávání historie je vypnuto"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Místnost není anonymní"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Místnost je částečně anonymní"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Místnost je plně anonymní"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
-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:1164
+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:1139
-#: ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 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:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Heslo OpenGPG není platné"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG klíč není důvěryhodný"
 
-#: ../src/gui_interface.py:1170
-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:1198
+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:1182
+#: ../src/gui_interface.py:1210
 #, fuzzy
-msgid "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment variable probably not \t\t\t\tcorrectly set)"
-msgstr "Gnome Keyring je 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový E-mail pro %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8398,7 +8751,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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8413,44 +8766,42 @@ msgstr ""
 "Předmět: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/gui_interface.py:1417
-#: ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Protějšek zastavil přenos"
 
-#: ../src/gui_interface.py:1419
-#: ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Chyba při čtení souboru"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8459,161 +8810,194 @@ msgstr ""
 "Nepodařilo se dešifrovat zprávu od %s\n"
 "Možná je falešná."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Nepodařilo se dešifrovat zprávu"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Konflikt uživatelských jmen"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Chyba."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Konflikt Zdrojů"
 
-#: ../src/gui_interface.py:1722
-msgid "You are already connected to this account with the same resource. Please type a new one"
+#: ../src/gui_interface.py:1753
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
 msgstr "Už jsi připojen(a) k tomuto účtu se stejným zdrojem. Prosím zadej nový"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce zahájit hlasový rozhovor. "
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 msgid "Voice Chat Request"
 msgstr "Žádost o hlasový rozhovor"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Chyba ověřování SSL certifikátu"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, 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:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovat tuto chybu certifikátu."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, 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:1936
-#: ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Nezabezpečené Spojení"
 
-#: ../src/gui_interface.py:1937
-msgid "You are about to send your password on an unencrypted 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?"
+#: ../src/gui_interface.py:1970
+#, 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:1939
-#: ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ano, chci se připojit nezabezpečeně"
 
-#: ../src/gui_interface.py:1972
-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: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 ""
+"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:2043
+#, 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?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "PEP uzel nebyl smazán"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP uzel %(node)s se nepodařilo odstranit: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547
-#: ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Smajlíci byly vypnuty"
 
-#: ../src/gui_interface.py:2548
-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:2623
+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:2570
-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: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."
+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:2598
-#: ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
 # FIXME: jaky je rozdil mezi settings a preferences? - kdo vi :)
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Zadej heslo GPG klíče pro účet %(keyid)s (účet %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG klíč vypršel"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Váš GPG klíč vypršel, k %s budete připojen(a) bez OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
 
@@ -8621,75 +9005,77 @@ msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
 msgid "_New Group Chat"
 msgstr "_Nová diskuze"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 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:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Nemůžu nalézt databázi s historií"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. holds time
-#: ../src/history_manager.py:174
-#: ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:180
-#: ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Přezdívka"
 
 #. holds message
-#: ../src/history_manager.py:188
-#: ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Zpráva"
 
-#: ../src/history_manager.py:248
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
+#: ../src/history_manager.py:241
+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:250
+#: ../src/history_manager.py:243
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"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:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Exportuji záznamy historie..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583
-#: ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Tato operace je nevratná."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -8729,36 +9115,35 @@ msgstr "Stav je nyní %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stav je nyní %(status)s"
 
-#: ../src/htmltextview.py:513
-#: ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Obrázek je příliš veliký"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Rozhovory"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Diskuze"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Soukromé rozhovory"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Zprávy"
 
@@ -8770,22 +9155,22 @@ msgstr "- zprávy budou zaznamenány"
 msgid "- messages will not be logged"
 msgstr "- zprvý nebudou zaznamenány"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Změnil(a) stav"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se přihlásil"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se odhlásil"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová jednoduché zpráva od %(nickname)s"
@@ -8810,7 +9195,7 @@ msgstr "Nová zpráva od %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nová zpráva od %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorovat"
 
@@ -8818,22 +9203,18 @@ msgstr "Ignorovat"
 msgid "Retrieving profile..."
 msgstr "Stahuji profil..."
 
-#: ../src/profile_window.py:110
-#: ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Soubor je prázdný"
 
-#: ../src/profile_window.py:113
-#: ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Soubor neexistuje"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127
-#: ../src/profile_window.py:143
-#: ../src/roster_window.py:2850
-#: ../src/roster_window.py:2861
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
@@ -8858,189 +9239,227 @@ msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
 #: ../src/profile_window.py:362
-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."
+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:280
-#: ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš stav."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, 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:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG je nepoužitelné"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
-#: ../src/roster_window.py:2148
-#: ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:2149
-#: ../src/roster_window.py:3395
-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: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?"
+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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "nesynchronizováno"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Opravdu ukončit Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Opravdu chcete ukončit Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Vždy zavřít Gajim"
 
-#: ../src/roster_window.py:2333
-#: ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Zrušit přenos souboru"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:2334
-msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
-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:2403
+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:2577
+#: ../src/roster_window.py:2651
 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:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:2581
-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:2655
+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:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transport bude smazán"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, 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:2653
+#: ../src/roster_window.py:2731
 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:2655
-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:2733
+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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Přejmenovat kontakt"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Zadej novou přezdívku pro kontakt %s."
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Přejmenovat skupinu"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Zadej nové jméno pro skupinu %s."
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Odstranit skupinu"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Chceš smazat skupinu %s z rosteru?"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, 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:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
-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:3310
+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:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Chcete pokračovat?"
 
-#: ../src/roster_window.py:3226
-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:3320
+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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty budou smazány z Vašeho rosteru"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9049,44 +9468,62 @@ 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:3295
-msgid "You are about to send a custom status. Are you sure you want to continue?"
+#: ../src/roster_window.py:3390
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Chystáte se poslat vlastní stav. Určitě chcete pokračovat?"
 
-#: ../src/roster_window.py:3297
-#, python-format
-msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he 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:3392
+#, 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."
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Uložení metakontaktů není podporováno serverem"
 
-#: ../src/roster_window.py:3899
-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:4022
+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:3984
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4114
+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:3986
-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: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."
+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:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Neplatná cesta k souboru:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9094,12 +9531,12 @@ msgstr[0] "Chcete poslat %s tento soubor:"
 msgstr[1] "Chcete poslat %s tyto soubory:"
 msgstr[2] "Chcete poslat %s tyto soubory:"
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Odeslat %s %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Udělej %s a %s metakontaktem"
@@ -9109,133 +9546,131 @@ msgstr "Udělej %s a %s metakontaktem"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718
-#: ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798
-#: ../src/statusicon.py:248
-#: ../src/statusicon.py:295
-#: ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:4847
-#: ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Spravovat _záložky..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "účtu %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:4963
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "_Zveřejnit hudbu"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Zveřejnit hudbu"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "_Nastavit služby..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maximalizovat Vše"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153
-#: ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Ode_slat skupinovou zprávu"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Všem uživatelům"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Všem dostupným uživatelům"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Spravovat kontakty"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Provést příkaz..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "Transporty"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Upravit transport"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maximalizovat"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Znovu připojit"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Odpojit"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Správce historie"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 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:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
@@ -9244,14 +9679,12 @@ msgstr "Změnit popis stavu..."
 msgid "Waiting for results"
 msgstr "Čekání na výsledky"
 
-#: ../src/search_window.py:132
-#: ../src/search_window.py:210
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Chyba v příchozím datagramu"
 
 #. No result
-#: ../src/search_window.py:166
-#: ../src/search_window.py:202
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Žádný výsledek"
 
@@ -9264,19 +9697,18 @@ msgstr "Chyba zápisu na disk"
 msgid "Subject: %s"
 msgstr "Předmět: %s"
 
-#: ../src/session.py:429
-#: ../src/session.py:464
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Potvrdit volby pro toto sezení"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Vzdálený klient chce navázat sezení s těmito volbamy:\n"
 "\n"
@@ -9299,121 +9731,126 @@ msgstr ""
 "\n"
 "Pokračovat v komunikaci?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "v _rosteru"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
-#: ../src/tooltips.py:347
-#: ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:350
-#: ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr "[blokováno]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr "[minimalizováno]"
 
-#: ../src/tooltips.py:474
-#: ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslední stav: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Spojeno"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Odpojenol"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Autorizace: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Hudba:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Upozornění"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Stáhnout"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Nahrát"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:664
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: ../src/tooltips.py:670
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pozastaveno"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9421,136 +9858,527 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Time:Neznámý"
 
-#: ../src/vcard.py:299
-#: ../src/vcard.py:309
-#: ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vztah</b>"
 
-#: ../src/vcard.py:344
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+#: ../src/vcard.py:343
+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:346
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+#: ../src/vcard.py:345
+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:348
+#: ../src/vcard.py:347
 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:350
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+#: ../src/vcard.py:349
+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:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Není zde žádný nevyřízený požadavek."
 
-#: ../src/vcard.py:364
-#: ../src/vcard.py:418
-#: ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Vstoupit do _Diskuze"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "Přid_at kontakt..."
+
+# FIXME: chtelo by to cesky vyraz pro service discovery
+#~ msgid "_Discover Services"
+#~ msgstr "_Prohlížet služby"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "Provést příkaz..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "Upravit účet"
+
+#~ msgid "_Personal Events"
+#~ msgstr "Osobní údaje"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Začít rozhovor"
+
+#~ msgid "_Status"
+#~ msgstr "_Stav"
+
+#~ 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 "Edit Personal Information..."
+#~ msgstr "Upravit osobní informace..."
+
+#~ 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 "Port: "
+#~ msgstr "Port: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Uložit _heslo (nebezpečné)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Odesílat keep-alive pakety"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Použít _SSL (staré)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "N_astavit podle stavu"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Smazat MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "Ode_slat zprávu serveru"
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Obdržet zprávu \n"
+#~ "Kontakt odpojen \n"
+#~ "Kontakt změnil stav \n"
+#~ "Zvýraznění zprávy z diskuze \n"
+#~ "Obdržení zprávy z diskuze \n"
+#~ "Žádost o přenos souboru \n"
+#~ "Začátek přenosu souboru \n"
+#~ "Ukončení přenosu souboru"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontakty\n"
+#~ "skupiny\n"
+#~ "všichni"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Vstoupit do _Diskuze"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopírovat JID/Emailovou adresu"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopírovat odkaz"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Otevři Emailový editor"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Otevřít v prohlížeči"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Začít rozhovor"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Řádek účtu\n"
+#~ "Řádek skupiny\n"
+#~ "Řádek kontaktu\n"
+#~ "Nadpis rozhovoru"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Změ_nit přezdívku"
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Změnit _předmět"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Nastavit _místnost"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Zničit místnost"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Spravuj Místnost"
+
+#~ msgid "Send _File"
+#~ msgstr "Odeslat _Soubor"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Přid_at do Seznamu"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Odeslat soukromou zprávu"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Zadej JID nebo jméno kontaktu\n"
+#~ "Historie diskuzí\n"
+#~ "Historie všech rozhovorů"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Spravovat účty"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Přidat kontakt do Seznamu (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Přidat tuto místnost do záložek"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Procházet historii diskuze (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Změnit téma místnosti (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Změ_nit přezdívku"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Pozvat kontakty k rozhovoru (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Poslat soubor (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Zobraz seznam smajlíků (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Zobrazit seznam formátování"
+
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Zobrazit nabídku rozšířených funkcí (Alt+D)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Zobrazit profil kontaktu (Ctrl+I)"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Přepnout audio"
+
+#~ msgid "Toggle video session"
+#~ msgstr "Přepnout video"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Všechny stavy rozhovoru\n"
+#~ "Pouze píšu zprávu\n"
+#~ "Vypnuto"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Automaticky zjistit při každém startu aplikace\n"
+#~ "Vždy použít výchozí aplikace z GNOME\n"
+#~ "Vždy použít výchozí aplikace z KDE\n"
+#~ "Vždy použít výchozí aplikace z Xfce\n"
+#~ "Vlastní"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Samostatný roster a samostatná okna pro diskuze\n"
+#~ "Samostatný roster s jedním diskuzním oknem\n"
+#~ "Samostatné okno pro všechno\n"
+#~ "Samostatný roster a samostatná okna pro diskuze pro každý účet\n"
+#~ "Samostatný roster s diskuzními okny podle typu"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Upozorni mě aktivací okna\n"
+#~ "Upozorni mě\n"
+#~ "Zobrazit pouze v rosteru"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "žádná\n"
+#~ "oboustranná\n"
+#~ "ode mě\n"
+#~ "ke mě"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-close"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Přid_at Kontakt..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Vlastnosti serveru"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Přenosy souborů"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil, A_vatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "Úč_ty"
+
+#~ msgid "_Contents"
+#~ msgstr "_Obsah"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Nastavení"
+
+#~ msgid "_Quit"
+#~ msgstr "_Konec"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Odeslat jednoduchou _zprávu..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Odeslat jednoduchou _zprávu"
+
+#~ msgid "Sta_tus"
+#~ msgstr "S_tav"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Diskuze"
+
+#~ msgid "Enable"
+#~ msgstr "Povolit"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "Upravit úč_et..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Nesprávné jméno počítače"
+
+#~ msgid "Invalid local address? :-O"
+#~ 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..."
+
+#~ 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."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Je potřeba python-sexy."
+
+# FIXME: runtime je jak?
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ runtime vyžaduje podporu libglade"
+
+# FIXME: runtime?
+#~ 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 "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim vyžaduje PySQLite2"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Příchozí zpráva:"
+
 #~ msgid "_Outgoing message:"
 #~ msgstr "_Odchozí zpráva:"
 
 #, fuzzy
 #~ 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 "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 ""
 #~ "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á]"
+
 #~ msgid "%i days ago"
 #~ msgstr "před %i dny"
+
 #~ msgid "Trayicon"
 #~ msgstr "Tray ikona"
+
 #~ 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 PyGTK >= 2.10."
 #~ msgstr "Je potřeba PyGTK verze 2.10. nebo vyšší."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Přidat zvláštní _upozornění"
+
 #~ msgid "Assign Open_PGP Key"
 #~ msgstr "Přiřadit Open_PGP klíč"
 
 # FIXME: co je zeroconf?
 #~ 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 "No help info for /%s"
 #~ msgstr "Žádná další nápověda pro /%s"
+
 #~ msgid "Enable link-local/zeroconf messaging"
 #~ msgstr "Povolit lokální zprávy typu zeroconf"
+
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Přezdívka nenalezena: %s"
+
 #~ msgid "This group chat has no subject"
 #~ msgstr "Místnost nemá žádné téma"
+
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "Pozval(a) %(contact_jid)s do %(room_jid)s."
+
 #, fuzzy
 #~ msgid "Nickname not found"
 #~ msgstr "Přezdívka nenalezena: %s"
@@ -9564,24 +10392,28 @@ msgstr "zdroj s prioritou "
 #~ "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 [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 <room>@<server>[/nickname], offers to join room@server "
 #~ "optionally using specified nickname."
@@ -9596,20 +10428,25 @@ msgstr "zdroj s prioritou "
 #~ 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>, 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 <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ů."
@@ -9619,49 +10456,61 @@ msgstr "zdroj s prioritou "
 #~ "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"
 
 #, fuzzy
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Vybrat účet pro synchronizaci"
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Vždy použít OS/X výchozí aplikace"
-#~ msgid "Custom"
-#~ msgstr "Vlastní"
+
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Přenos souboru byl ukončen protistranou"
+
 #~ msgid "Generic"
 #~ msgstr "Obecné"
+
 #~ msgid ""
 #~ "%(title)s by %(artist)s\n"
 #~ "from %(source)s"
 #~ msgstr ""
 #~ "%(title)s od %(artist)s\n"
 #~ "z %(source)s"
+
 #~ msgid "Your JID:"
 #~ msgstr "Vaše JID:"
+
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Dvakrát použité Jabber ID"
+
 #~ msgid "This account is already configured in Gajim."
 #~ msgstr "Tento účet už je nastaven v Gajimu."
+
 #~ msgid "Mood"
 #~ msgstr "Nálada"
+
 #~ msgid "Activity"
 #~ 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ů"
+
 #~ msgid "Servers Features"
 #~ msgstr "Vlastnosti serveru"
+
 #~ msgid "Click to see past conversation in this room"
 #~ msgstr "Kliknutím zobraz historii konverzace v této místnosti"
+
 #~ msgid "<b>History Viewer</b>"
 #~ msgstr "<b>Prohlížeč historie</b>"
+
 #~ msgid "<b>JID Selection</b>"
 #~ msgstr "<b>Výběr JID</b>"
+
 #~ msgid ""
 #~ "Choose the chatlog you want to view. \n"
 #~ "Enter the jid of a groupchat or a contact here. For online accounts you "
@@ -9670,72 +10519,104 @@ msgstr "zdroj s prioritou "
 #~ "Vyber záznam rozhovoru pro zobrazení.\n"
 #~ "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í"
+
 #~ msgid "Name:"
 #~ msgstr "Jméno:"
+
 #~ msgid "<b>Publish and Subscribe</b>"
 #~ msgstr "<b>Zveřejni a odebírej</b>"
+
 #~ 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 "Receive your contact's:"
 #~ msgstr "Přijmi tvé kontakty:"
+
 #~ msgid "Tune"
 #~ msgstr "Píseň"
+
 #~ msgid "Avatar:"
 #~ msgstr "Avatar:"
+
 #~ msgid "Birthday:"
 #~ msgstr "Narozeniny:"
+
 #~ msgid "City:"
 #~ msgstr "Město:"
+
 #~ msgid "Company:"
 #~ msgstr "Společnost:"
+
 #~ msgid "Country:"
 #~ msgstr "Země:"
+
 #~ msgid "Family:"
 #~ msgstr "Příjmení:"
+
 #~ msgid "Full Name"
 #~ msgstr "Celé jméno"
+
 #~ msgid "Given:"
 #~ msgstr "Křestní:"
+
 #~ msgid "Homepage:"
 #~ msgstr "Dom. stránka:"
+
 #~ msgid "Middle:"
 #~ msgstr "Prostřední:"
+
 #~ msgid "Position:"
 #~ msgstr "Pozice:"
+
 #~ msgid "Prefix:"
 #~ msgstr "Titul:"
+
 #~ msgid "Role:"
 #~ msgstr "Postavení:"
+
 #~ msgid "State:"
 #~ msgstr "Stát:"
+
 #~ msgid "Suffix:"
 #~ msgstr "Za jménem:"
+
 #~ msgid "A_ccounts"
 #~ msgstr "Úč_ty"
+
 #~ msgid "_Services"
 #~ msgstr "_Služby"
+
 #~ msgid "Ask:"
 #~ msgstr "Oslovení:"
+
 #~ msgid "Client:"
 #~ msgstr "Klient:"
+
 #~ msgid "OS:"
 #~ msgstr "OS:"
+
 #~ msgid "Subscription:"
 #~ msgstr "Autorizace: "
+
 #~ msgid "Modify Account"
 #~ msgstr "Upravit účet"
 
@@ -9750,6 +10631,7 @@ msgstr "zdroj s prioritou "
 #, fuzzy
 #~ msgid "working"
 #~ msgstr "Pracuji"
+
 #~ msgid "day_off"
 #~ msgstr "volný den"
 
@@ -9760,10 +10642,13 @@ msgstr "zdroj s prioritou "
 #, fuzzy
 #~ msgid "having_tea"
 #~ msgstr "Holím se"
+
 #~ msgid "in_a_car"
 #~ msgstr "v autě"
+
 #~ msgid "in_real_life"
 #~ msgstr "v reálném životě"
+
 #~ msgid "on_a_bus"
 #~ msgstr "v autobuse"
 
@@ -9774,6 +10659,7 @@ msgstr "zdroj s prioritou "
 #, fuzzy
 #~ msgid "on_a_train"
 #~ msgstr "Ve vlaku"
+
 #~ msgid "on_a_trip"
 #~ msgstr "na cestě"
 
@@ -9788,6 +10674,7 @@ msgstr "zdroj s prioritou "
 #, fuzzy
 #~ msgid "sleeping"
 #~ msgstr "Spím"
+
 #~ msgid "walking"
 #~ msgstr "Procházím se"
 
@@ -9810,6 +10697,7 @@ msgstr "zdroj s prioritou "
 #, fuzzy
 #~ msgid "in_awe"
 #~ msgstr "devět"
+
 #~ msgid "in_love"
 #~ msgstr "zamilovaný"
 
@@ -9820,69 +10708,91 @@ msgstr "zdroj s prioritou "
 #, fuzzy
 #~ msgid "sick"
 #~ msgstr "Nemocný"
+
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
+
 #~ msgid "gajim-remote"
 #~ msgstr "gajim-remote"
+
 #~ msgid "OpenGPG"
 #~ msgstr "OpenGPG"
+
 #~ msgid "gnome-keyring"
 #~ msgstr "gnome-keyring"
+
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compilation of gtkspell module from "
 #~ "Gajim sources."
 #~ msgstr ""
 #~ "Je potřeba python-gnome2-extras nebo zkompilovaný gtkspell modul ze "
 #~ "zdrojáků Gajima."
+
 #~ msgid "Notification-daemon"
 #~ msgstr "Notification-daemon"
+
 #~ msgid "Idle"
 #~ msgstr "Nečinný"
+
 #~ 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 "libsexy"
 #~ msgstr "libsexy"
+
 #~ msgid "%s is now known as %s"
 #~ msgstr "%s se nyní nazývá %s"
+
 #~ msgid "%s is now %s (%s)"
 #~ msgstr "%s je nyní %s (%s)"
+
 #~ msgid "%s is now %s"
 #~ msgstr "%s je nyní %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "From: %(from_address)s"
 #~ msgstr ""
 #~ "\n"
 #~ "Odesílatel: %(from_address)s"
+
 #~ msgid "Network Manager support not available"
 #~ msgstr "Podpora Network Manageru není dostupná"
+
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
+
 #~ msgid ""
 #~ "Usage: %s %s %s \n"
 #~ "\t %s"
 #~ msgstr ""
 #~ "Použití: %s %s %s \n"
 #~ "\t %s"
+
 #~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 #~ msgstr ""
 #~ "Neexistující příkaz: /%s (chceš-li poslat tohle, napiš před to /say)"
+
 #~ 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"
+
 #~ msgid "OK to continue with negotiation?"
 #~ 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"
@@ -9900,26 +10810,36 @@ msgstr "zdroj s prioritou "
 #~ "s\n"
 #~ "\n"
 #~ "Přejete si pokračovat s šifrovaném sezení?"
+
 #~ msgid "Yes, I verified the Short Authentication String"
 #~ msgstr "Ano, ověřil(a) jsem Short Authentication String"
+
 #~ 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"
 #~ msgstr "Pro pokračování potřebuje Gajim uložená tajemství.Zadej heslo"
+
 #~ msgid "Confirm Passphrase"
 #~ msgstr "Potvrďte heslo"
+
 #~ msgid "Enter your new passphrase again for confirmation"
 #~ msgstr "Zadejte nové heslo znovu pro ověření"
+
 #~ msgid "Create Passphrase"
 #~ msgstr "Vytvořit heslo"
+
 #~ msgid "Passphrases did not match.\n"
 #~ msgstr "Hesla se neshodují.\n"
+
 #~ msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
 #~ msgstr "Gajim potřebuje vytvořit heslo pro zašifrování uložených tajemství"
+
 #~ 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. "
@@ -9928,24 +10848,30 @@ msgstr "zdroj s prioritou "
 #~ "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 ""
 #~ "Subject: %s\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Předmět: %s\n"
 #~ "%s"
+
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim účet %s"
+
 #~ 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."
 #~ msgstr "Spojení k počítači nebylo navázáno: Neplatná odpověd od serveru"
@@ -9953,12 +10879,15 @@ msgstr "zdroj s prioritou "
 #, fuzzy
 #~ msgid "Encryption disabled"
 #~ msgstr "E2E Šifrování vypnuto"
+
 #~ msgid "Close"
 #~ msgstr "Zavřít"
+
 #~ msgid "Verify remote identity"
 #~ msgstr "Ověřit identitu"
+
 #~ msgid "<b>\"%(title)s\"</b> by "
 #~ msgstr "<b>\"%(title)s\"</b> od"
+
 #~ msgid "Thoughtful"
 #~ msgstr "Zamyšlený"
-
diff --git a/po/da.po b/po/da.po
index 4518efb26..cd35e85d8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-11-18 19:33+0100\n"
 "Last-Translator: Niels Felsted Thorsen <felsted@fsfe.org>\n"
 "Language-Team:  <>\n"
@@ -17,59 +17,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Emacs 22.1.50.1, po-mode 2.02+0.4\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+ Jabber klient"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Deltag i en _Gruppe Samtale..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Tilføj Kontakt..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "Op_dag Tjenester"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Udfør Kommando..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Ændre Konto"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Åbn Gmail Indboks"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Personlige hændelser"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Start Samtale..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -79,23 +31,23 @@ msgstr ""
 "\n"
 "Vent venligst..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Vælg en af mulighederne under:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Fyld ind data for din eksisterende konto</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../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/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -103,57 +55,64 @@ msgstr ""
 "Tilføj dette certifikat til listen af certifikater du stoler på.\n"
 "SHA1 fingeraftryk af certifikatet:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anonym godkendelse"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Tilslut når jeg trykke Færdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Oprettelses Guide"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Jeg har allerede en konto jeg vil br_uge"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Jeg vil _registrere en ny konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Hvis valgt vil Gajim huske adgangskoden for denne konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Håndter..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ingen"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Pro_xy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Gem adgangs_kode"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Sæt min profil når jeg tilslutter"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Brug tilpasset værtsnavn/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -161,148 +120,142 @@ msgstr ""
 "Du behøver en konto for at tilslutte dig\n"
 "til Jabber netværket"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Avanceret"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Færdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Værtsnavn:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Adgangskode"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Information</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "_Tilpas til status"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Ændring af Konto"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Kontoer"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Administrative handlinger"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonym godkendelse"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Tilslut automatisk hvis tilslutningen tabes"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "T_ilslut når Gajim startes"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Ænd_re Adgangskode"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Tjek denne således at Gajim vil tilslutte på port 5223 hvor gamle servere "
-"forventes at ha SSL muligheder. Bemærk at Gajim bruger TLS kryptering som "
-"standard hvis det er rundsendt af serveren, og med denne indstilling valgt "
-"vil TLS blive deaktiveret."
+"Hvis valgt vil Gajim spørge dig før din adgangskode bliver sendt over en "
+"usikker forbindelse."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Vælg _Nøgle..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Tryk for at ændre kontoens adgangskode"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Tryk for at forespørge om autorisering for alle kontakter af en anden konto"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Tilslut _når Gajim startes"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Tilslutning"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Redigere Personlig Information..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Epost:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Fornavn:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "General"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Værtsnavn:"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -310,8 +263,11 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -319,16 +275,7 @@ msgstr ""
 "Hvis valgt vil Gajim sende hold-i-live pakker for at forhindre at "
 "tilslutningen afbrydes pga et tidsudløb"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Hvis valgt vil Gajim gemme adgangskoden i ~/.gajim/config med læse "
-"rettigheder kun for dig"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -336,8 +283,7 @@ msgstr ""
 "Hvis valgt vil Gajim vil Gajim, når den startes, automatisk tilslutte sig "
 "til jabber med denne konto"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -347,47 +293,50 @@ msgstr ""
 "(håndteret med kombinationsfeltet i bunden af kontaktvinduet) ændre status "
 "på denne konto"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Information om dig, som er gemt på serveren"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Efternavn:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Fle_t kontoer"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Ingen nøgle er valgt"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Ingen"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Personlig Information"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_tet:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -397,22 +346,20 @@ msgstr ""
 "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/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil automatisk ændres ifølge din status."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Om_døb"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Ressour_ce:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -426,200 +373,89 @@ msgstr ""
 "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/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Gem _pgp-løsen (ikke sikkert)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Gem konversations _logger for alle kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Send hold-i-live pakker"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Send hold-i-live pa_kker"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Synkroniser kontakter"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Brug _SSL (gammel type)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Brug fil transport proxy"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Tilpas til status"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Navn:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "_Tilpas til status"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Kontoer"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anonym godkendelse"
-
-#: ../data/glade/accounts_window.glade.h:13
-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."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Tilslut _når Gajim startes"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Epost:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Fornavn:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Hvis valgt vil Gajim hente adgangskoden fra en GPG agent som seahorse"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Efternavn:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Fle_t kontoer"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Om_døb"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Send hold-i-live pa_kker"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Synkroniser kontakter"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Brug G_PG Agenten"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Brug tilpasset værtsnavn/p_ort"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Brug pers_onlig port:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Brug fil transport proxy"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "R_ediger Personlig Information..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "Aktiv_er"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Værtsnavn:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "Hå_ndter..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port: "
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "Ad_var mig før jeg bruger en usikker forbindelse"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "br_ug HTTP__PROXY miljøvariablen"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-tilføj"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-luk"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-fjern"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "K_onto:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Tilføj Ny Kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -631,7 +467,7 @@ msgstr ""
 "protokol. Klik på registrer knappen for at\n"
 "fortsætte."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -639,410 +475,467 @@ msgstr ""
 "Du må være tilsluttet til transporten for at kunne\n"
 "tilføje en kontakt for denne protokol."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Kælenavn:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "Kan _registreres"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>En fejl er opstået:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../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>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc Kommandoer - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Kontroller en gang til"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Fejl beskrivelse..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Vent mens kommandolisten bliver modtaget..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Vent mens kommandoen bliver sendt..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Vent venligst..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Denne jabber enhed eksponerer ikke nogen kommandoer."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivelse</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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> Du skal genstarte Gajim for at nogle af ændringerne kan træde i "
 "kraft"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Avanceret Konfigurations Behandler"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Slet MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Slet Dagens Besked"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Rediger _Privatlivs Liste..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Send en besked til brugere som er tilsluttet denne server"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Sæt MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Sæt Dagens Besked"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsol"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Opdater MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Opdater Dagens Besked"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Send Server Besked..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Handlinger</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Betingelser</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Lyde</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Avancerede Handlinger"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Avanceret Påmindelses Kontrol"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Status For Alle"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Borte"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Travlt "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Kør en kommando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Ikke Tilgængelig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "En eller flere specielle statuser..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "På net / Klar For Samtale"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Spil en lyd"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Modtag en Besked\n"
-"Kontakt Ikke Tilsluttet \n"
-"Kontakt Ændrede Status \n"
-"Gruppe Samtale Besked Fremhævelse \n"
-"Gruppe Samtale Besked Modtaget \n"
-"Fil Overførsel Forespørgsel \n"
-"Fil Overførsel Er Startet \n"
-"Fil Overførsel Er Sluttet"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Deaktivér automatisk åbning af samtale vindue"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Deaktivér eksisterende pop op vinduer"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../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/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Deaktivér visning af hændelse i kontaktvinduet"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Deaktivér visning af hændelse i systembakken"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informer mig med et pop op vindue"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Åbn samtale vindue med bruger"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Vis hændelse i kontaktvindue"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Vis hændelse i systembakken"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "og jeg "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kontakt(er)\n"
-"gruppe(r)\n"
-"alle"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "for "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Indgang:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Feed navn:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Sidst ændret:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Ny hændelse modtaget"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Du har modtaget en ny hændelse:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blokerede Kontakter"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Besked:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Sæt Aktivitet"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Sæt en aktivitet"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Besked:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Humør:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Ændre Adgangskode"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Skriv adgangskoden igen for at bekræfte:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Skriv en ny adgangskode:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Aktivitet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Humør:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Forvalgte beskeder:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Gem som Forvalgt..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Bliv med i en _Gruppe Samtale"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Tilføj til Kontaktliste..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopier JID/E-post Adresse"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopier Henvisning"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Åbn E-post Program"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Åbn Henvisning i Netlæser"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Start Samtale"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#. 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 "_Send"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "In_viter"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Inviter Venner!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "MUC server"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Vælg en MUC server."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1050,187 +943,185 @@ msgstr ""
 "Du er ved at begynde en Multibruger samtale.\n"
 "Vælg de kontakter du vil invitere"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Tilføj Speciel Påmi_ndelse..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Tilskriv Open_PGP Nøgle..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "Kør K_ommando..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Ændre _Grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Inviter _Kontakter"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Send _Tilpasset Status"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Send en Enkel _Besked"
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Send _Fil..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Angiv Personlig _Avatar..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Start _samtale"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Slå til/fra ende til ende Kryptering"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Slå til/fra Open_PGP Kryptering"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Tilføj til Kontaktliste..."
+
+#: ../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"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Bloker"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Nægt ham/hende at se min status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historie"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignorer"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Håndter Kontakt"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Omdøb..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Fjern blokering"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "Ikke ign_orer"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Udfyld formen."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Rum Konfigurering"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "<b>(ESession</b> info)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "Efterprø_v"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Egenskaber"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Annuller filoverførsel"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Annullerer den valgte filoverførsel"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Ryd _op"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Filoverførsler"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Skjuler vinduet"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverførsler fra listen."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1238,75 +1129,74 @@ 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/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Fortsæt"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Påmind mig når en filoverførsel er færdig"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Åbn folderen med filen"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "filoverførsel liste"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Samtalestatus Fane Farver</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Konto række\n"
-"Gruppe række\n"
-"Kontakt række\n"
-"Samtale Banner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Konto"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Fed"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Komponere"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Font stil:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Tilpasning"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Gruppe"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Ikke aktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1314,7 +1204,7 @@ msgstr ""
 "MUC\n"
 "Beskeder"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1322,109 +1212,73 @@ msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Sat på pause"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Tekst _farve:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Tekst _font:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Baggrund:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Ændre _Kælenavn..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Ændre _Emne..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Tilpas _Rum..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Bogmærke"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Slet rum"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "Håndter Ru_m"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimer ved lukning"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Or_dstyrer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Beboer Handlinger"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Send _Fil"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Tilføj til Kontaktliste"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Administrator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Udvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Kast ud"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Ejer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Send en Privat Besked"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Stemme"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Lav en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Fra"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Emne"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1435,25 +1289,19 @@ msgstr ""
 "kører. \n"
 "Generelt undgå at slette logger fra kontakter du samtidig snakker med."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Slet"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Eksporter"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Loghistorie Håndterer"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1467,402 +1315,418 @@ msgstr ""
 "Brug dette program til at slette eller eksportere logger. Du kan selektere "
 "logger fra venstre og/eller søge databasen under. "
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Søg Database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Skriv JID eller Kontakt navn\n"
-"Historik For Gruppesamtaler\n"
-"Historik For Alle Samtaler"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Kontakt navn"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Gruppesamtaler"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Søg:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Log samtale historie"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Bogmærk dette rom"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Gennemse"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Bliv med i en Gruppe Samtale"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Kælenavn:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Adgangskode:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "For nylig:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Bogmærk dette rom"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Bliv med:"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Håndter Kontoer"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Bliv automatisk med"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Håndter Bogmærker"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimer ved Automatisk Deltagelse"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "PEP Tjeneste Konfigurering"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Konfigurere"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-slet"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaber</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Opsætning</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Håndter Proxy Profiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Adgangs_kode"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Proxy _vært:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Proxy _Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Brug HTTP prox_y"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Brug proxy godkendelse"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Navn:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Brugernavn:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Tilføj denne kontakt til kontaktvinduet (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Bogmærk dette rom (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Gennemse samtale historik (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Ændre emne for rummet (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Ændre dit kælenavn (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Inviter kontakter til samtalen (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Send en fil (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Hvis en liste over følelsesikoner (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Hvis en liste over følelsesikoner"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Vis en menu med avancerede funktioner (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Vis kontaktens profil (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Send"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "PGP-løsen"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Avanceret Konfigurations Behandler</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Programmer</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Handlinger</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatisk Status</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Samtale udseende</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Samtalelinie Farver</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Samtalestatus påmindelser</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Betingelser</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Tilpasset Opsætning</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Skrifttype</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail Indstillinger</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Nuværende Status Beskeder</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Privatliv</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Kontaktvinduets Udseende</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Status Beskeder</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Temaer</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Mellemnavn:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Synlige Påmindelser</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Avanceret..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Alle samtale tilstander\n"
-"Kun skrivning\n"
-"Ikke aktiveret"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Status For Alle"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Tillad _OS information at blive sendt"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Tillad _OS information at blive sendt"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Tillad lyde når jeg er o_ptaget"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Borte"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Spørg om status besked når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"Automatisk genkend hvergang Gajim starter\n"
-"Altid brug GNOME standard programmer\n"
-"Altid brug KDE standard programmer\n"
-"Altid brug Xfce standard programmer\n"
-"Tilpasset"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "T_ilslut når Gajim startes"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Samtale besked:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Alti_d kontroller om Gajim er standard Jabber klient ved start"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Komponere"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Konfigurér farve og skrifttyper for brugergrænsefladen"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Samtale besked:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontakt navn"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Tilpasset Opsætning</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
-"Frigjort kontaktvindue med frigjorte samtale vinduer\n"
-"Frigjort kontaktvindue med enkelt samtale vindue\n"
-"Et enkelt vindue for alt\n"
-"Frigjort kontaktvindue med samtale vindue grupperet per konto\n"
-"Frigjort kontaktvindue med samtale vindue grupperet per type"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Ikke aktiveret"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Vis kontakternes _aktivitet i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Vis kontakternes humør i kontaktvinduet"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis kontak_ternes melodier i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Vis kontakternes a_vatarer i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis kontakternes humør i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Vis status _beskeder for kontakter i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1872,7 +1736,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "vise i samtalevinduerne."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1882,7 +1746,7 @@ msgstr ""
 "med en kontakt. Her kan du specificere hvilke typer samtalestatus du vil "
 "sende til modparten."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1890,31 +1754,31 @@ msgstr ""
 "Gajim vil påminde dig med et pop op vindue i højre bund af skærmen når en "
 "kontakt logger af"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Skjul alle knapperne i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr ""
 "Hvis valgt vil Gajim tillade andre at kunne se det operativ system du bruger"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Hvis valgt vil Gajim også inkludere information om senderen af den nye e-post"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Hvis valgt vil Gajim ændre status til Væk når computeren ikke bliver brugt."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1922,7 +1786,7 @@ msgstr ""
 "Hvis valgt vil Gajim ændre status til Ikke Tilgængelig når computeren ikke "
 "har været brugt i endnu længere tid"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1930,7 +1794,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise avatarer af kontakter i kontaktvinduet og i gruppe "
 "samtaler"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1938,23 +1802,29 @@ msgstr ""
 "Hvis valgt vil Gajim vise status beskeder af kontakter under kontaktnavnet i "
 "kontaktvinduet og i gruppe samtaler"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "Hvis valgt vil Gajim vise kontakternes aktivitet i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr "Hvis valgt vil Gajim vise kontakternes humør i kontaktvinduet"
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Hvis valgt vil Gajim vise kontakternes humør i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Hvis valgt vil Gajim vise i kontaktvinduet, hvilken melodi kontakten spiller"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1964,7 +1834,7 @@ msgstr ""
 "intet sprog er valgt ved at højreklikke i indtastningsfeltet, vil standard "
 "sproget blive brugt for denne kontakt eller gruppe samtale."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1974,7 +1844,7 @@ msgstr ""
 "kontakter. Brug med forsigtighed fordi det vil blokere alle beskeder fra "
 "alle kontakter som ikke er i kontaktvinduet."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -1984,7 +1854,7 @@ msgstr ""
 "opmærksom på når der bruges E2E kryptering må den anden i samtalen godkende "
 "evt. logning, ellers vil samtalen i blive logget."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1992,7 +1862,7 @@ msgstr ""
 "Hvis valgt vil Gajim vise en påmindelse når en ny e-post er modtaget via "
 "Gmail"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2002,7 +1872,7 @@ msgstr ""
 "kontakt fra MSN vil have det tilsvarende msn ikon for status tilsluttet, "
 "borte, Travlt, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2010,7 +1880,7 @@ msgstr ""
 "Hvis aktiveret vil Gajim i spørge for en status besked. Den valgte standard "
 "besked vil blive brugt i stedet."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2018,79 +1888,101 @@ msgstr ""
 "Hvis valgt vil Gajim erstatte tekst smileys som denne ':)' med den "
 "tilsvarende animerede eller statiske grafiske følelsesikon"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Log krypt_eret samtale session"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Gør samtalevinduer _kompakte"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Hå_ndtere..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Aldrig\n"
-"Kun ved ventende hændelser\n"
-"Altid"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Server"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Påmindelser"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Påmind mig om kontakter logger _ind"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Påmind mig om kontakter som logger u_d"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Påmind mig om kontakter som logger u_d"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Påmind mig ved ny _GMail e-post"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Aldrig\n"
+"Kun ved ventende hændelser\n"
+"Altid"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Personlig Hændelser"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Afspil _lyde"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
 msgstr ""
-"Pop det op\n"
-"Påmind mig om det\n"
-"Hvis kun i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Indstillinger"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "_Vis hændelse i kontaktvindue"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Vis systembakken:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Logge _ind"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Log _af"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2099,27 +1991,27 @@ msgstr ""
 "valgt\n"
 "vil Gajim kun vise den rå tekst."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Status _ikonsæt:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2131,7 +2023,7 @@ msgstr ""
 "$S vil blive erstattet med den forrige status besked\n"
 "$T vil blive erstattet med auto-away tidsudløb"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2143,366 +2035,381 @@ msgstr ""
 "$S vil blive erstattet med den forrige status besked\n"
 "$T vil blive erstattet med auto-not-available timeout"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Brug _transportens ikonsæt"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Brug system stan_dard"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Når en ny hændelse er modtaget:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Fejl besked: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Kælenavn:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Væk efter:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Netlæser:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "Vis samtalestatus påmin_delser:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "Føl_elsesikoner:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Filhåndterer:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "Frem_hæv stavefejl"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hændelser fra kontakter som ikke er i kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorer rigt indhold i indkommende beskeder"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Log status ændringer hos kontakter"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_E-post klient:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "Ikke tilgæ_ngelig efter:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Åbn..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Nulstil til Standard Farver"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Send samtalestatus påmindelser:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Status besked:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "_URL fremhævning:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Vinduets adfærd:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "i _gruppe samtaler"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "i _kontaktvinduet"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutter"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privatlivs Lister:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Tilføj / Ændre en regel</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Liste af regler</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privatlivs Liste</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktiv i denne session"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktiv efter hver start"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Alle"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Alle (inkluderende abonnering)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Tillad"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Nægt"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Bestil:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Privatlivs Liste"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "Alle efter abonnering"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "Alle i gruppen"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ingen\n"
-"begge\n"
-"fra\n"
-"til"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Begge"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Fra"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "en"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "to"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "at sende mig beskeder"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "at sende mig forespørgsler"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "at sende mig status"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "at se min status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresse</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>By:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Afdeling:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Efternavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Fuldt Navn</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Fornavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Hjemmeside:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Mellemnavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Navn:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../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/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Stilling:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Postnummer:</b>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Titel:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Rolle:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Stat:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Gade:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Endetillæg:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Om"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Tryk for at se din avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Personlig Information"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Arbejde"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Fjern kun k_ontoen fra Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Kan fjernes"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2510,194 +2417,145 @@ msgstr ""
 "<b>nogen@etsted.com</b> vil gerne at du <b>tilføjer</b> nogen kontakter i "
 "dit kontaktvindue."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../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/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Bytte af punkt i kontaktvinduet"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "luk"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "_Tilføj Kontakt..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "_Egenskaber"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Filover_førsler"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Ofte Stillede Spørgsmål (på net)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Hjælp på net"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil, A_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Vis Kun _Aktive Kontakter"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Vis _Afkoblede Kontakter"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Vis _Kontaktvindue"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "K_ontoer"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Indhold"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_OSS"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Hjælp"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Indstillinger"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Afslut"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Send en Enkel _Besked..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Vis"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Vent mens en søge form hentes..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Søg"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Tilføj Kont_akt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Søg"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "N_aviger"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registrer til"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Afbryd"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Fra:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Send et svar til denne besked"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Send besked"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Send besked og luk vinduet"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Emne:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Til:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "Sva_r"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Send & Luk"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_torisere"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2705,176 +2563,191 @@ msgstr ""
 "Nægt autorisation fra kontakter så han eller hun ikke kan opnå information "
 "om at du er tilsluttet"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Abonnement Forespørgsel"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Nægt"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Vælg den konto som du vil synkronisere med"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synkronisering : vælg kontakter"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Slå lyden af"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Send en Enkel _Besked"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Vis Alle Ventende Hænd_elser"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Gruppe Chat"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Spørg:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Kontakt tid:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressource:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abonnering:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Konfigureret avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Kontakt Information"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Mere"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Bruger avatar:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Skrifttype</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafik</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Inddata</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktiver"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Information/Forespørgsel (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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Besked"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Ændre Konto"
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lokal jid:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Resource:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "En GTK+ Jabber klient"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Annuller bekræftelse"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Tjeneste sendte malformeret data"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Tjeneste ændrede sessionsnøglen."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Tjeneste returnerede en fejl."
 
@@ -2899,7 +2772,7 @@ msgstr "Heltal"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Farve"
 
@@ -3036,88 +2909,88 @@ msgstr "Svensk"
 msgid "Chinese (Ch)"
 msgstr "Kinesisk"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Sprog for stavekontrollen"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "En tilslutning er ikke tilgængelig"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Understregning"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Streg"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Fjern formatering"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Virkelig send denne fil?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering aktiveret"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Ikke i Kontaktvinduet"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Denne kontakt understøtter ikke fil overførsler."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøgle valgt"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3125,50 +2998,50 @@ msgstr ""
 "Ingen GPG nøgle er valgt for denne kontakt. Derfor kan du ikke kryptere "
 "beskeder med GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Session VIL blive logget"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Session VIL IKKE blive logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "og godkendt"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3177,23 +3050,23 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale session %(logged)s blive logget."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Session forhandling annulleret"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Denne session er krypteret"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " og VIL blive logget"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " og VIL IKKE blive logget"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3201,25 +3074,25 @@ msgstr ""
 "Kontaktens identitet er ikke verificeret Tryk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering ikke aktiveret"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende besked var IKKE krypteret"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du har netop modtaget en besked fra \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3227,15 +3100,15 @@ msgstr ""
 "Hvis du lukker dette faneblad og ikke har aktiveret historie loggen, vil du\n"
 "miste denne besked."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Database Fejl"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3244,110 +3117,120 @@ msgstr ""
 "Database filen (%s) kan ikke læses. Prøv at reparere den eller fjerne den "
 "(hele historikken vil tabes)."
 
-#: ../src/chat_control.py:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nu %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "opretter log database"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "opretter log database"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim vil nu slutte"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "opretter %s katalog"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Ændre status information"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Ændre status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Sæt tilstedeværelses type og beskrivelse"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Åben for samtaler"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Udvidet borte"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Forstyr ikke"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Ofline - ikke tilsluttet"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Din status er blevet ændret."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Forlad Gruppesamtaler"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s i %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Du detlager ikke i en gruppesamtale."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Du forlod de følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Videresend ulæste beskeder"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Alle ulæste beskeder er blevet videresendt."
 
@@ -3449,9 +3332,9 @@ msgstr ""
 "kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "standard"
 
@@ -3744,12 +3627,12 @@ msgstr ""
 "Hvis Sandt, vil Gajim vise status beskeder, hvis ikke tomme, for hver "
 "kontakt under kontaktnavnet i kontaktvinduet."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 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:229
+#: ../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."
@@ -3757,7 +3640,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:230
+#: ../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."
@@ -3766,7 +3649,7 @@ msgstr ""
 "kontakt ændrer hans eller hendes status og/eller hans eller hendes status "
 "besked."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3780,30 +3663,30 @@ msgstr ""
 "vil Gajim skrive alle status beskeder. Hvis \"in_and_out\" vil Gajim kun "
 "skrive FOO kommer/forlader gruppesamtalen."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 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:234
+#: ../src/common/config.py:235
 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:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis en avatar for selve transporten."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke hvis kontaktvindue i vindueslisten."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3813,7 +3696,7 @@ msgstr ""
 "vinduet (standard adfærd i de fleste vindueshåndterere) når det indeholder "
 "ventende begivenheder."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3824,7 +3707,7 @@ msgstr ""
 "sha information i gruppesamtaler."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3845,31 +3728,31 @@ msgstr ""
 "'pertype' - Hver besked type (for eks. samtaler versus gruppesamtaler) "
 "bliver sendt til et specifikt vindue."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Skjuler knapperne i samtale vinduer."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Skjuler banneret i et gruppesamtale vindue"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Skjuler banneret i et to personers samtalevindue"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skjuler gruppesamtale deltagerlisten i gruppesamtale vinduer."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3877,15 +3760,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indrykning når man fletter ens kælenavne."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Udglattet rulning af beskeder i samtale vinduet"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3893,11 +3776,11 @@ msgstr ""
 "Liste af farver, separeret med \":\", som vil blive brugt til at farve "
 "kælenavne i gruppesamtaler."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3905,7 +3788,7 @@ msgstr ""
 "Skal vi vise bekræftelses vinduet for oprettelse af metakontakter? Tom "
 "streng betyder at vi aldrig viser vinduet."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3913,7 +3796,7 @@ msgstr ""
 "Skal vi vise bekræftelses vinduet for blokering af kontakter? Tom streng "
 "betyder at vi aldrig viser vinduet."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3921,7 +3804,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:259
+#: ../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 "
@@ -3931,7 +3814,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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3939,7 +3822,7 @@ msgstr ""
 "Hvis Sandt vil Gajim bruge Gnome Nøglering (hvis tilgængelig) til at gemme "
 "konto adgangskoder."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3947,7 +3830,7 @@ msgstr ""
 "Hvis sandt vil Gajim bruge KDE Wallet (hvis kwelletcli er tilgængelig) til "
 "at gemme konto adgangskoder."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3955,7 +3838,7 @@ msgstr ""
 "Hvis Sandt vil Gajim vise antallet af online og totale kontakter i konto og "
 "gruppe rækker."
 
-#: ../src/common/config.py:263
+#: ../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"
@@ -3963,7 +3846,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:264
+#: ../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."
@@ -3971,7 +3854,7 @@ msgstr ""
 "Hvis Sandt vil Gajim rulle ned/op og vælge den kontakt som sendte dig den "
 "sidste besked, hvis ikke allerede kontaktvinduet er åbent."
 
-#: ../src/common/config.py:265
+#: ../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."
@@ -3979,12 +3862,12 @@ msgstr ""
 "Hvis Sandt vil Gajim omdanne strengen mellem $$ og $$ til et billede med "
 "dvips og omdanne det inden det bliver sat ind i et samtale vindue."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 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:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3992,7 +3875,7 @@ msgstr ""
 "Maksimum antal linjer som bliver skrevet i samtaler. De ældste linjer bliver "
 "slettet."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4000,11 +3883,11 @@ msgstr ""
 "Hvis sandt vil påmindelses vinduer fra påmindelses dæmonen blive fæstet til "
 "ikonet i systembakken."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Vælg interval mellem 2 kontroller for ingen aktivitet."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4012,7 +3895,7 @@ 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:271
+#: ../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)"
@@ -4020,7 +3903,7 @@ 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:272
+#: ../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!"
@@ -4029,13 +3912,13 @@ msgstr ""
 "forbindelse til en konto bliver etableret. ADVARSEL: Dette forårsager en "
 "masse forespørgsler!"
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 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:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4043,7 +3926,23 @@ msgstr ""
 "Når bliver selv kontakt rækken vist. Kan være \"always\", "
 "\"when_other_resource\" eller \"never\""
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4051,7 +3950,7 @@ msgstr ""
 "Prioriteten vil ændres automatisk ifølge din status. Prioriteter er "
 "defineret i autopriority_* indstillingerne."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4060,40 +3959,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:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Hvis valgt, gendan den sidste status som var brugt."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 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:298
+#: ../src/common/config.py:308
 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:301
+#: ../src/common/config.py:311
 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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne konto."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 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:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4101,30 +4000,38 @@ msgstr ""
 "En ordnet liste (adskilt af mellemrum) af forbindelses typer som skal "
 "prøves. Kan indeholde tls, ssl eller plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
 "klar tekst."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 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:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Hvis en advarsels dialog før en adgangskode sendes over en forbindelse i "
+"klar tekst."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellemrums adskilt liste af ssl fejl som skal ignoreres."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Mellemrum sendt efter inaktivitet"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sendt efter inaktivitet"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4133,11 +4040,11 @@ msgstr ""
 "prøver at forbinde igen."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 tilpasning"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4145,15 +4052,15 @@ msgstr ""
 "Hvis valgt vil Gajim bruge din IP og proxy defineret i file_transfer_proxies "
 "indstillingen for filoverførsler."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Svar til modtagelses forespørgsel"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Sendte modtagelses forespørgsler"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4161,11 +4068,16 @@ msgstr ""
 "Ved forhandling af en krypteret session, skal Gajim da antage at du vil have "
 "dine beskeder logget?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP aktiveret for denne kontakt?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4173,101 +4085,101 @@ msgstr ""
 "Skal Gajim automatisk starte en krypteret session med denne kontakt når det "
 "er muligt?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 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:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "alt eller mellemrums separeret status"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nej', eller 'begge'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'ja', 'nej' eller ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Snart tilbage"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Tilbage om få minutter."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så læg en besked."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Jeg ser en film."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbejder"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Jeg arbejder."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Jeg snakker i telefon."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Ude"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Jeg er ude og nyder livet."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Jeg er tilgængelig."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Jeg er tilgængelig for en samtale."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Er straks tilbage."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgængelig."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Ikke forstyr."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Farvel!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4276,58 +4188,50 @@ msgstr ""
 "muc_highlight_words, eller når en gruppesamtale besked indeholder dit "
 "kælenavn."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 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:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "grøn"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "købmandsvarer"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "menneske"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marint"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Ikke i stand til at indlæse tomgangs modulet"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Forkert vært"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Invalid local address? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrerings information for transporten %s har ikke ankommet i tide"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Tilslutning lykkedes"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Tilslutning med agenten %s lykkedes"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Tilslutning fejlede"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4335,39 +4239,39 @@ msgstr ""
 "Tilslutning med agenten %(agent)s mislykkedes med fejlen %(error)s: %"
 "(error_msg)s"
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Disk skrivefejl"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Usynlighed er ikke understøttet"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s understøtter ikke usynlighed."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Ugyldigt Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 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:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4376,7 +4280,7 @@ 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:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kælenavn er ikke tilladt: %s"
@@ -4384,76 +4288,76 @@ msgstr "Kælenavn er ikke tilladt: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Ikke i stand til at deltage i gruppesamtale."
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Maksimalt antal brugere for %s er nået"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er bandlyst fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalen %s eksisterer ikke."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oprettelse er begrænset."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Dit registrerede kælenavn skal bruges i gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten for gruppesamtalen %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Rummet er blevet ødelagt"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan deltage i dette rum i stedet: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil gerne tilføje dig til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nu på %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "forespørsel om ophør på abonnement fra %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nu abonnerer vi ikke længere på %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4591,28 +4495,28 @@ msgstr "Nøglebrug indeholder ikke certifikat signering"
 msgid "Application verification failure"
 msgstr "Kunne ikke verificere programmet"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 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:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne besked er *krypteret* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4621,79 +4525,79 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilslutning til konto \"%s\" er blevet afbrudt"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Tilslut manuelt."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serveren %s gav en anderledes registreringsform"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukendt SSL fejl: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Forkert svar"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke tilslutte til \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Kontroller din tilslutning eller forsøg igen senere."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server svarede: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Tilslutning til proxy fejlede"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke tilslutte til kontoen %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, 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:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4702,7 +4606,7 @@ msgstr ""
 "\n"
 "SSL Fejl: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4711,24 +4615,24 @@ msgstr ""
 "\n"
 "Ukendt SSL fejl: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Kontroller din tilslutning eller prøv igen senere"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Godkendelse fejlede med \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Venligst kontroller om dit logind og adgangskode er korrekt."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Fejl under fjernelse af privatlivs liste"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4737,43 +4641,43 @@ 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Sendte kontakter:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grund af usynlig status"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Tilslutning fejlede"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Frakobling fra serveren %(server)s mislykkedes: %(error)s"
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Iagttagere"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Ikke i kontaktvindue"
 
@@ -4782,38 +4686,53 @@ msgstr "Ikke i kontaktvindue"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus kører ikke korrekt på denne maskine"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"pysqlite2 (også kaldet python-pysqlite2) afhængighed mangler. Slutter..."
+#: ../src/common/dbus_support.py:54
+#, 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/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, 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"
+
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Database kan ikke læses."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 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:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Sessions bussen er ikke tilgængelig.\n"
+"Prøv at læse http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Sessions bussen er ikke tilgængelig.\n"
 "Prøv at læse http://trac.gajim.org/wiki/GajimDBus"
@@ -4981,240 +4900,277 @@ msgstr "Slutten af ugen"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brugernavn."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Server adresse påkrævet."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i værtsnavn."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressource."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Travlt"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Travlt"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Ikke tilgængelig"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Tilgængelig for samtale"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "Ti_lgængelig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Tilgængelig"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Væk"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Afkoblet"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Afkoblet"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukendt"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har fejl"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Intet"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Intet"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Deltagere"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Deltager"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Besøgende"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Ejer"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "er opmærksom på samtalen"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "gør noget andet"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "holder pause med at komponere en besked"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanebladet"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr "fra rum %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr "fra bruger %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " fra %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, 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:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Rum Konfigurering"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+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"
@@ -5224,17 +5180,74 @@ msgstr "Fejl under kørsel af \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldigt logniveau"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Standard Besked"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Størrelse: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fejl: kan ikke åbne %s for læsning"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "flytter log databasen til flere indeks"
 
@@ -5871,19 +5884,19 @@ msgstr "Studerer"
 msgid "Writing"
 msgstr "Skriver"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Ukendt Artist"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Ukendt Titel"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Ukendt Kilde"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5893,12 +5906,12 @@ msgstr ""
 "fra <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5907,7 +5920,7 @@ msgstr ""
 "annulleret."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5978,24 +5991,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fejl ved tilføjelse af tjeneste. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Ikke aktiveret"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Standard Besked"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Aktiveret"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbog for sproget %s er ikke tilgængelig"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6004,69 +6013,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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "status besked Titel"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "status besked tekst"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Log ind igen nu?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "Det er ikke muligt at bruge OpenPGP på denne computer"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Ulæste hændelser"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Læs alle ventende hændelser før denne konto fjernes."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har en åben samtale med kontonavnet %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Du er for øjeblikket tilsluttet til serveren"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "For at ændre kontonavnet må du afbryde din tilslutning"
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Kontonavnet er allerede i brug"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6074,143 +6083,143 @@ msgstr ""
 "Dette navn er allerede brugt til en af dine andre kontoer. Vælg venligst et "
 "andet navn."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Ugyldigt kontonavn"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Kontonavnet kan ikke være tomt."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Kontonavnet kan ikke indeholde mellemrom."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Omdøb Konto"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Indtast et nyt navn for kontoen %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 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:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Ugyldig indgang"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Personlig port må være et port nummer."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Forsøg på at hente krypteringsnøgler mislykkedes"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Der er ikke nogen hemmelig OpenPGP nøgle tilgængelig."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøgle Valg"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Vælg din OpenPGP Nøgle"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Ingen konto ved det navn er tilgængelig"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilsluttet til serveren"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Din server understøtter ikke Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke gemme din personlige information."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "For at deaktivere din konto må du afbryde din tilslutning."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Den Lokale Konto eksisterer allerede."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Liste over bandlyste"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Ejer Liste"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Kælenavne"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Bandlysning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6218,11 +6227,11 @@ msgstr ""
 "<b>Hvem vil du bandlyse?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Tilføj Medlem..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6230,11 +6239,11 @@ msgstr ""
 "<b>Hvem vil du gøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Tilføj Ejer..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6242,11 +6251,11 @@ msgstr ""
 "<b>Hvem vil du gøre til ejer?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Tilføj Administrator..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6254,7 +6263,7 @@ msgstr ""
 "<b>Hvem vil du gøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6270,86 +6279,114 @@ 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:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerne kontoen med navnet %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Følelsesikoner er ikke aktiveret"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Adgangskode er Påkrævet"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv din adgangskode for kontoen %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Gem adgangskode"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilsluttet til serveren"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Hvis du fjerne den vil tilslutningen tabes."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Tilslutning til proxy fejlede"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Hvad vil du gøre?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Fjern kun k_ontoen fra Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Gå kun ind og ud"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Ny Gruppe Samtale"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Dette bogmærke er ugyldigt"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 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:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Ugyldigt kælenavn"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Tegn ikke tilladt: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Ugyldigt server"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Ugyldig rum"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Kontoen er blevet tilføjet med succes"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6359,33 +6396,33 @@ msgstr ""
 "eller senere ved at vælge kontoens menupunkt under Rediger menuen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto er blevet oprettet med succes"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Ugyldigt brugernavn"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Du må give et brugernavn for at konfigurere denne konto."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 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:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Certifikatet er allerede i filen"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6400,7 +6437,7 @@ msgstr ""
 "SSL Fejl: %(error)s\n"
 "Vil du stadig prøve at forbinde til denne server?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6411,59 +6448,59 @@ msgstr ""
 "Certifikatets SHA1 fingeraftryk:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Under oprettelsen af kontoen opstod der en fejl"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Kontonavnet er i brug"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Du har allered en konto med dette navn."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Hændelse"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Første Besked er Modtaget"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Næste Besked Modtages i Fokus"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Næste Besked Modtages uden Fokus"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt er Tilsluttet"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt er ikke Tilsluttet"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Besked er Sendt"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Besked Fremhævning"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Besked Modtaget"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "GMail E-post Modtaget"
 
@@ -6486,44 +6523,44 @@ msgstr ""
 "Teksten under denne linje er hvad der er blevet sagt siden\n"
 "sidste gang du var opmærksom på denne gruppe samtale"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Læs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Slå dette op i Or_dbogen"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web søge URL'en mangler en \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Søg på nettet efter det"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Åbn som et _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6531,7 +6568,7 @@ msgstr[0] "I går"
 msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Emne: %s\n"
@@ -6635,70 +6672,70 @@ msgstr "Yahoo! Adresse:"
 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruger ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Bruger ID'en må ikke indeholde en resource."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke tilføje dig selv til kontaktvinduet."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakten er allerede i kontaktvinduet"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Denne kontakt er allered i dit kontaktvindue"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Bruger ID:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabber klient"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Nuværende Programudviklere:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Tidligere Programudviklerer:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "TAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Niels Felsted Thorsen <felsted@fsfe.org>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6711,101 +6748,101 @@ msgstr ""
 "\n"
 "Egenskaben med at fremhæve stavefejl vil ikke blive brugt"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Kælenavnet har ikke tilladte tegn."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Forespørgsel om abonnering fra %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i en gruppe samtale %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Deltag i Gruppe Samtale med kontoen %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kælenavn"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppe samtale Jabber ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, 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:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppe samtale Jabber ID'en indeholder ikke tilladte tegn."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Dette er ikke en gruppe samtale"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet på en gruppe samtale."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 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:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Denne konto er ikke tilsluttet til serveren"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start en samtale med konto %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6814,173 +6851,171 @@ msgstr ""
 "en besked til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Tilslutning er ikke tilgængelig"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, 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:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke fortolke \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan kun ændre din adgangskode hvis du er tilsluttet."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Ugyldig adgangskode"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Du må indtaste en adgangskode."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Adgangskoderene i de to tekstindtastningsfelter må være identiske."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakt Loggede Ind"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggede Ud"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Ny Besked"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Ny Enkel Besked"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Ny Privat Besked"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Filoverførsel Fejl"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Filoverførsel er Fuldført"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Filoverførsel Stoppede"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale Invitation"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakt Ændrede Status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Besked med konto %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Besked i konto %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Enkel Besked"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Modtaget %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsol for %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Konsol"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Trist"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Ændre"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6989,153 +7024,153 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Tilføj"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Ændre"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Slet"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Tilføj Kont_akt"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Fjerner kontakt fra kontaktvinduet"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatlivs Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rækkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Tilføj en regel</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatlivs Liste for %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Privatlivs lister"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Ugyldig Listenavn"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 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:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Du er inviteret til en gruppesamtale."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har inviteret dig til at deltage i en diskussion"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Vil du acceptere denne invitation?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Vælg Lyd"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Lyde"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Vælg Billede"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Billeder"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s bliver:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Tilføj Speciel Påmindelse for %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "når jeg er"
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7146,19 +7181,19 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng er: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verificeret denne kontakts identitet."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet er verificeret"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Verificer igen..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7168,19 +7203,19 @@ msgstr ""
 "beskeder eller sende dig beskeder, må du verificere deres identitet ved at "
 "trykke på knappen under."
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet er IKKE verificeret"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Verificer..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Har du bekræftet den kontaktens identitet?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7195,23 +7230,23 @@ msgstr ""
 "\n"
 "Denne sessions Korte Ægtheds Streng: <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 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:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøgle er tildelt denne kontakt. Derfor kan du ikke kryptere "
 "beskeder."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7220,7 +7255,7 @@ msgstr ""
 "nøgle</b>, så beskeder <b>kan ikke</b> krypteres. Brug din GPG klient til at "
 "ændre dette."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7228,52 +7263,52 @@ msgstr ""
 "GPG Nøgle er tildet til denne kontakt, og du stoler på denne nøgle, så "
 "beskeder vil blive krypteret."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Konference"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 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:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Opdag Tjenester med kontoen %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Opdag Tjenester"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Tjenesten findes ikke"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7281,94 +7316,98 @@ 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:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Det er ikke mulig at gennemse denne tjeneste"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Ikke gyldigt server navn"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Gennemse %(address)s med konto %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Gennemse"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjeneste har ingen elementer som kan gennemses."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Kør Kommando"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Brugere"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Bogmærke"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Bogmærke er allerede sat"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppe samtale \"%s\" er allerede i dine bogmærker."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Bogmærket er blevet tilføjet succesfuldt"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Abonnerede"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Knude"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Abonner"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Frameld abonnement"
 
@@ -7419,7 +7458,7 @@ msgstr "Kræver python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Egenskab ikke tilgængelig under Windows."
 
@@ -7582,104 +7621,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Kræver python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Bannere og klikbare links"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-"Muligheden for at have trykbare URL'er i samtale og gruppe samtale vindues "
-"bannere."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Kræver python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Kræver python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Egenskab"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Fremgang"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Afsender: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Modtager: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gemt i: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Filoverførsel er fuldført"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Åbn folderen med filen"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Filoverførsel er afbrudt"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Modtager: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Fejl besked: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Filoverførsel stoppede"
 
@@ -7687,7 +7712,7 @@ msgstr "Filoverførsel stoppede"
 msgid "Choose File to Send..."
 msgstr "Vælg en Fil at Sende..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Beskrivelse: "
 
@@ -7719,12 +7744,12 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vil gerne sende dig en fil:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:860
+#: ../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."
@@ -7732,22 +7757,22 @@ msgstr ""
 "En fil med dette navn eksisterer allerede og du har ikke rettigheder til at "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Denne fil eksisterer allerede"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Kataloget \"%s\" er ikke skrivbart"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheder til at oprette filer i dette katalog."
 
@@ -7783,72 +7808,56 @@ msgstr "Fil: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Afsender: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Fortsæt"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim behøver en X server for at kunne køre. Slutter..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importering af PyGTK fejlede: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim behøver PyGTK 2.12 eller højere"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim behøver PyGTK 2.12 eller højere for at køre. Slutter..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim behøver GTK 2.12 eller højere"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim behøver GTK 2.12 eller højere for at køre. Slutter..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ udførselsmiljø mangler libglade understøttelse"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Fjern venligst dit nuværende GTK+ udførselsmiljø og installer den sidste "
-"stabile version fra %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Hver venligst sikker på at GTK+ og PyGTK har libglade understøttelse på dit "
-"system."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim behøver PySQLite2 for at køre"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behøver pywin32 for at køre"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7858,11 +7867,11 @@ msgstr ""
 "det fra %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim kører allerede"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7905,8 +7914,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "Konto"
 
@@ -7928,12 +7937,15 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "en af: offline, online, chat, away, xa, dnd, invisible"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "besked"
 
@@ -8170,70 +8182,89 @@ msgstr ""
 "blive sendt til alle kontoer"
 
 #: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Ændre status"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Picture to use"
+msgstr "Kælenavn som skal bruges"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Den konto hvor XML vil blive sendt; hvis ikke den er specificeret, vil XML "
+"blive sendt til alle kontoer"
+
+#: ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndter en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI som skal håndteres"
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Besked indhold"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Deltag i et MUC rum"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Rum JID"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "kælenavn"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Kælenavn som skal bruges"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "adgangskode"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Adgangskode for at slutte sig til rummet"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Kontroller om Gajim kører"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Viser eller gemmer ipython vinduet"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Manglende argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8242,15 +8273,15 @@ msgstr ""
 "'%s' er ikke i dit kontaktvindue.\n"
 "Specificer venligst en konto for at sende beskeden."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ud til at Gajim ikke kører. Så du kan ikke bruge gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8259,16 +8290,16 @@ msgstr ""
 "Brug: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke fundet"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8277,7 +8308,7 @@ msgstr ""
 "Brug: %s kommando [argumenter]\n"
 "Kommando er en af:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8286,7 +8317,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8295,7 +8326,11 @@ msgstr ""
 "Argument \"%(arg)s\" er ikke specificeret. \n"
 "Skriv \"%(basename)s help %(command)s\" for mere information"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Forkert uri"
 
@@ -8324,178 +8359,179 @@ msgstr "Du kan ikke slette det nuværende tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vælg venligst en anden for dit nuværende tema."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Sending af privat besked fejlede"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Indsæt Kælenavn"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Samtale med "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Fortsat samtale"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "En hvilken som helst deltager har lov til at se din fulde JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Rum logging er aktiveret"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Et nyt rum er blevet oprettet"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s er blevet udvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blevet uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nu kendt som %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "tilknytning ændret"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "Rum konfiguration er blevet ændret til 'kun for medlemmer'"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "computeren slukkes"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s har forladt samtalen"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s deltager nu i gruppe samtalen"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 er nu %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "Ikke spørg mig ige_n"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Ændre emne"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Anfør et nyt emne:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Ændre kælenavn"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Anfør dit nye kælenavn:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Fjern %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8503,22 +8539,22 @@ msgstr ""
 "Du er ved at definitivt fjerne dette rum.\n"
 "Du kan anføre en grund herunder:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også indtaste et alternativt mødested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparker %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Du kan anføre en begrundelse under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Udeluk %s"
@@ -8538,59 +8574,59 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Rapporter Fejl"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fejl: kan ikke åbne %s for læsning"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Fejl ved læsning af fil:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber client"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 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:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Udvidelse er ikke understøttet"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Gem Billede som..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8601,58 +8637,58 @@ msgstr ""
 "anden indehaver.\n"
 "Specificer venligst et andet kælenavn under:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 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:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Accepterer du denne forespørsel?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterer du denne forespørgsel for konto %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisering for %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Tilslutning Fejlede"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fejl opstod under sending %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Abonnement forespørgsel"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorisering accepteret"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" har fjernet abonneringen på dig"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8660,60 +8696,60 @@ 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Frameldt abonnement"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke blive etableret"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, 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:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Rummet viser nu; ikke tilgængelige medlemmer"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "Rummet viser nu ikke; ikke tilgængelige medlemmer"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Rum logging er nu aktiveret"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Rum logging er nu deaktiveret"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Rummet er nu ikke-anonymt"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Rummet er nu semi-anonymt"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Rummet er nu helt anonymt"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
@@ -8721,23 +8757,23 @@ msgstr ""
 "Du har konfigureret Gajim til at bruge GPG agenten, men der er ingen GPG "
 "agent som kører eller den returnerede en forkert gpg-løsen.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er for øjeblikket tilsluttet uden din OpenPGP nøgle."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Dit pgp-løsen er ikke korrekt"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenPGP-løsen er ikke korrekt"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG nøglen kan ikke stoles på"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8745,27 +8781,28 @@ 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:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8780,42 +8817,42 @@ msgstr ""
 "Emne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vil gerne sende dig en fil."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Den fjerne kontakt stoppede filoverførslen"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Fejl ved åbning af fil"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8824,36 +8861,36 @@ msgstr ""
 "Ikke i stand til at dekryptere beskeden fra %s\n"
 "Det er mulig den er blevet forfalsket."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Ikke i stand til at dekryptere beskeden"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Brugernavns Konflikt"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Skriv et nyt brugernavn for din lokale konto"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s .s)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Fejl."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Ressource Konflikt"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8861,21 +8898,22 @@ msgstr ""
 "Du er allerede tilsluttet til denne konto med den samme ressource. Skriv "
 "venligst en ny"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vil gerne sende dig en fil."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Filoverførsel Forespørgsel"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Fejl under verificering af SSL certifikat"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8886,15 +8924,15 @@ msgstr ""
 "server: %(error)s\n"
 "Vil du stadig prøve på at forbinde til denne server?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne fejl for dette certifikat."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "SSL certifikat fejl"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8911,23 +8949,28 @@ msgstr ""
 "\n"
 "Vil du stadig forbinde og opdatere fingeraftrykket for certifikatet?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Ikke sikker forbindelse"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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 over en ikke krypteret forbindelse. Er du "
-"sikker på du vil gøre dette?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg vil virkelig gerne tilslutte mig uden sikkerhed"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -8936,21 +8979,30 @@ msgstr ""
 "installere PyOpenSSL for at forhindre dette. Er du sikker på du vil gøre "
 "dette?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Du er ved at sende din adgangskode over en ikke krypteret forbindelse. Er du "
+"sikker på du vil gøre dette?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "PEP knude blev ikke fjernet"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP knude %(node)s blev ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Følelsesikoner er ikke aktiveret"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8958,7 +9010,7 @@ msgstr ""
 "Dit konfigurerede følelsesikon tema blev ikke fundet, så følelsesikoner er "
 "blevet deaktiveret."
 
-#: ../src/gui_interface.py:2570
+#: ../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 "
@@ -8968,40 +9020,40 @@ msgstr ""
 "opdatere formatet for filen emoticons.py. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Kunne ikke gemme din opsætning og indstillinger"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Adgangskode Påkrævet"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Indtast adgangskoden til GPG nøglen %(keyid)s (Konto %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG nøgle er udløbet"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG nøgle er udløbet, du vil blive tilsuttet til %s uden OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Forkert Adgangskode"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Indtast din GPG adgangskode igen eller annuller."
 
@@ -9009,44 +9061,44 @@ msgstr "Indtast din GPG adgangskode igen eller annuller."
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Jeg vil gerne tilføje dig til mit kontaktvindue"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finde historik log databasen"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Kælenavn"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Besked"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9060,26 +9112,26 @@ msgstr ""
 "\n"
 "I tilfælde du trykker JA, venligst vent..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Eksporter Historik Log..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Dette er en irreversibel handling."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9118,35 +9170,35 @@ msgstr "Status er nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nu: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Tidsudløb nået for at laste billede"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Billede er for stort"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Beskeder"
 
@@ -9158,22 +9210,22 @@ msgstr "- beskeder vil blive logget"
 msgid "- messages will not be logged"
 msgstr "- beskeder vil ikke blive logget"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Ændrede Status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Loggede Ind"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Loggede Ud"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
@@ -9198,7 +9250,7 @@ msgstr "Besked fra %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Ny Besked fra %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -9206,18 +9258,18 @@ msgstr "Ignorer"
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Filen eksisterer ikke"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Kunne ikke laste billede"
 
@@ -9249,53 +9301,53 @@ msgstr ""
 "Der var en fejl under publicering af din personlige information, prøv igen "
 "senere."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Flettede kontoer"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Godkendelse er blevet sendt"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu vil %s vide din status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Forespørgsel på abonnering er blevet sendt"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Godkendelse er blevet fjernet"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu vil %s altid se dig som offline."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG er ikke brugbar"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil blive tilsluttet til %s uden OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Du deltager i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9303,27 +9355,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "ikke synkroniseret"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Skal Gajim afsluttes?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på du vil afslutte Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Altid afslut Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Annuller filoverførsel"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Du har ulæste beskeder"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9331,16 +9394,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:2577
+#: ../src/roster_window.py:2651
 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:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil blive fjernet"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9348,11 +9411,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:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transporter vil blive fjernet"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9361,11 +9424,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:2653
+#: ../src/roster_window.py:2731
 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:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9374,56 +9437,56 @@ msgstr ""
 "dig."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Omdøb Kontakt"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Indtast et nyt kælenavn for kontakt %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Omdøb Gruppe"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Indtast et nyt navn for gruppen %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Fjern Gruppen"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Tildel OpenPGP Nøgle"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Vælg den nøgle du vil anvende til kontakten"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt %s vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9432,11 +9495,11 @@ msgstr ""
 "vil altid se dig som offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Vil du fortsætte?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9444,16 +9507,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter vil blive fjernet fra dit kontaktvindue"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9463,35 +9526,36 @@ msgstr ""
 "fjerner du også godkendelsen, hvilket medfører at de altid vil se dig som "
 "offline."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 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:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Ingen konto tilgængelig"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakt lagring er ikke understøttet af din server"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9500,12 +9564,12 @@ msgstr ""
 "information. Så denne information vil ikke blive gemt til næste gang du "
 "tilslutter dig."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9514,23 +9578,23 @@ msgstr ""
 "Metakontakter er en måde at gruppere flere kontakter på en linie. Oftest "
 "bruges det når den samme person har flere Jabber eller transport kontoer."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Ugyldig Fil URI:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Lav %s og %s til metakontakter"
@@ -9540,126 +9604,130 @@ msgstr "Lav %s og %s til metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "med konto %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "til %s konto"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "bruger %s konto"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Håndter Bog_mærker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "fra konto %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Ændre Status Besked"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Publicer Melodi"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Publicer Melodi"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Tilpas Tjenester..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maksimer alt"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Send Gruppeb_esked"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Til alle brugere"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Til alle brugere på net"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Håndter Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Ændre _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Send Enkel Besked"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Kør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "Hå_ndter Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Modificer Transport"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Omdøb"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Tilslut igen"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "Afbry_d tilslutningen"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Historik Håndterer"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Deltag i Ny Gruppe Samtale"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Ændre Status Besked..."
 
@@ -9690,13 +9758,13 @@ msgid "Confirm these session options"
 msgstr "Bekræft disse sessions indstillinger"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Den fjerne klient vil forhandle en session med disse egenskaber:\n"
 "\n"
@@ -9719,116 +9787,126 @@ msgstr ""
 "\n"
 "Fortsæt med sessionen?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Ændre Status Besked..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "i _kontaktvinduet"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Skjul denne menu"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [blokeret]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimeret]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Sidste status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Tilslutning afbrudt"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Abonnering: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Melodi:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Påmindelse"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Hent"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Send"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Fuldført"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Midlertidig stoppet"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Hænger"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjeneste har endnu ikke svaret med detaljeret information"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9836,28 +9914,28 @@ msgstr ""
 "Denne tjeneste kunne ikke svare med detaljeret information.\n"
 "Den er højst sandsynlig ikke fungerende"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Client:Ukendt"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Ukendt"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Tid:Ukendt"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilknytning:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9865,7 +9943,7 @@ msgstr ""
 "Denne kontakt er interesseret i din tilstedeværelses information, men du er "
 "ikke interesseret i hans/hendes tilstedeværelse"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9873,14 +9951,14 @@ msgstr ""
 "Du er interesseret i kontaktens tilstedeværelses information, men han/hun er "
 "ikke interesseret i din"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9888,18 +9966,375 @@ msgstr ""
 "Du er ikke interesseret i kontaktens tilstedeværelse, og han/hun er ikke "
 "interesseret i din"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Der er ikke nogen ventende abbonerings forespørgsler."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " ressource med prioritet "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Deltag i en _Gruppe Samtale..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Tilføj Kontakt..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "Op_dag Tjenester"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Udfør Kommando..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Ændre Konto"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Personlige hændelser"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Start Samtale..."
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Ændring af Konto"
+
+#~ 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 ""
+#~ "Tjek denne således at Gajim vil tilslutte på port 5223 hvor gamle servere "
+#~ "forventes at ha SSL muligheder. Bemærk at Gajim bruger TLS kryptering som "
+#~ "standard hvis det er rundsendt af serveren, og med denne indstilling "
+#~ "valgt vil TLS blive deaktiveret."
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Redigere Personlig Information..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Værtsnavn:"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Hvis valgt vil Gajim gemme adgangskoden i ~/.gajim/config med læse "
+#~ "rettigheder kun for dig"
+
+#~ msgid "Port: "
+#~ msgstr "Port: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Gem _pgp-løsen (ikke sikkert)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Send hold-i-live pakker"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Brug _SSL (gammel type)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Tilpas til status"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-tilføj"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-luk"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-fjern"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Slet MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Send Server Besked..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Modtag en Besked\n"
+#~ "Kontakt Ikke Tilsluttet \n"
+#~ "Kontakt Ændrede Status \n"
+#~ "Gruppe Samtale Besked Fremhævelse \n"
+#~ "Gruppe Samtale Besked Modtaget \n"
+#~ "Fil Overførsel Forespørgsel \n"
+#~ "Fil Overførsel Er Startet \n"
+#~ "Fil Overførsel Er Sluttet"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontakt(er)\n"
+#~ "gruppe(r)\n"
+#~ "alle"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Bliv med i en _Gruppe Samtale"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopier JID/E-post Adresse"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopier Henvisning"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Åbn E-post Program"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Åbn Henvisning i Netlæser"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Start Samtale"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Konto række\n"
+#~ "Gruppe række\n"
+#~ "Kontakt række\n"
+#~ "Samtale Banner"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Ændre _Kælenavn..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Ændre _Emne..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Tilpas _Rum..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Slet rum"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Håndter Ru_m"
+
+#~ msgid "Send _File"
+#~ msgstr "Send _Fil"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Tilføj til Kontaktliste"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Send en Privat Besked"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Skriv JID eller Kontakt navn\n"
+#~ "Historik For Gruppesamtaler\n"
+#~ "Historik For Alle Samtaler"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Håndter Kontoer"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-slet"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Tilføj denne kontakt til kontaktvinduet (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Bogmærk dette rom (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Gennemse samtale historik (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Ændre emne for rummet (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Ændre dit kælenavn (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Send en fil (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Hvis en liste over følelsesikoner (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Hvis en liste over følelsesikoner"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Vis en menu med avancerede funktioner (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Vis kontaktens profil (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Alle samtale tilstander\n"
+#~ "Kun skrivning\n"
+#~ "Ikke aktiveret"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Automatisk genkend hvergang Gajim starter\n"
+#~ "Altid brug GNOME standard programmer\n"
+#~ "Altid brug KDE standard programmer\n"
+#~ "Altid brug Xfce standard programmer\n"
+#~ "Tilpasset"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Frigjort kontaktvindue med frigjorte samtale vinduer\n"
+#~ "Frigjort kontaktvindue med enkelt samtale vindue\n"
+#~ "Et enkelt vindue for alt\n"
+#~ "Frigjort kontaktvindue med samtale vindue grupperet per konto\n"
+#~ "Frigjort kontaktvindue med samtale vindue grupperet per type"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Pop det op\n"
+#~ "Påmind mig om det\n"
+#~ "Hvis kun i kontaktvinduet"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ingen\n"
+#~ "begge\n"
+#~ "fra\n"
+#~ "til"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "luk"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "_Tilføj Kontakt..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "_Egenskaber"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Filover_førsler"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil, A_vatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "K_ontoer"
+
+#~ msgid "_Contents"
+#~ msgstr "_Indhold"
+
+#~ msgid "_FAQ"
+#~ msgstr "_OSS"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Indstillinger"
+
+#~ msgid "_Quit"
+#~ msgstr "_Afslut"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Send en Enkel _Besked..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Send en Enkel _Besked"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Gruppe Chat"
+
+#~ msgid "Enable"
+#~ msgstr "Aktiver"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Ændre Konto"
+
+#~ msgid "Wrong host"
+#~ msgstr "Forkert vært"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Invalid local address? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr ""
+#~ "pysqlite2 (også kaldet python-pysqlite2) afhængighed mangler. Slutter..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Bannere og klikbare links"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Muligheden for at have trykbare URL'er i samtale og gruppe samtale "
+#~ "vindues bannere."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Kræver python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ udførselsmiljø mangler libglade understøttelse"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Fjern venligst dit nuværende GTK+ udførselsmiljø og installer den sidste "
+#~ "stabile version fra %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Hver venligst sikker på at GTK+ og PyGTK har libglade understøttelse på "
+#~ "dit system."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim behøver PySQLite2 for at køre"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Indkommende besked:"
 
diff --git a/po/de.po b/po/de.po
index 7a10ed705..505645922 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: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-12-13 23:46+0100\n"
 "Last-Translator: Nico Gulden <cilugnedon@gmx.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -21,59 +21,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Lokalize 0.2\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Ein Jabber-Client in GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "_Gruppenchat betreten …"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "Kont_akt hinzufügen …"
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Dienste durchsuchen"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "B_efehl ausführen …"
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "Konto _bearbeiten"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "Google-Mail-Posteingang _öffnen"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Persönliche Ereignisse"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Chat starten …"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -83,23 +35,23 @@ msgstr ""
 "\n"
 "Bitte warten …"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Bitte wählen Sie eine der Optionen aus:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 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/glade/account_creation_wizard_window.glade.h:6
+#: ../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/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -107,57 +59,64 @@ msgstr ""
 "Dieses Zertifikat der Liste vertrauenswürdiger Zertifikate hinzufügen.\n"
 "SHA1-Fingerprint dieses Zertifikates:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anon_yme Authentifizierung"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Verbinden, sobald ich auf Fertig klicke"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Assistent zum Einrichten eines neuen Kontos"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Ich habe bereits ein Konto, das ich ben_utzen möchte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Ich möchte ein neues Konto _erstellen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Falls aktiviert, wird Gajim das Passwort für dieses Konto speichern."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Verwalten …"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Kein Proxy"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Pass_wort speichern"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Mein Profil setzen, wenn ich mich verbinde"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Benutzerdefinierten Rechnernamen und Port verwenden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -165,432 +124,347 @@ msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk \n"
 "verbinden können."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Erweitert"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Beenden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "Rec_hnername:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Verschiedenes</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persönliche Informationen</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "Mit Status _abgleichen"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Kontoänderung"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Konten"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Administrative Aktionen"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonyme Authentifizierung"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatisch neu verbinden, falls die Verbindung abbricht"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Beim Pr_ogrammstart verbinden"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Pass_wort ändern"
 
-#: ../data/glade/account_modification_window.glade.h:10
-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 "Aktivieren Sie diese Option, damit sich Gajim über Port 5223 verbindet, auf dem auch veraltete Server SSL-Fähigkeiten unterstützen. Beachten Sie, dass diese Option die neuere TLS-Verschlüsselung deaktiviert, die Gajim standardmäßig verwendet, wenn der Server sie unterstützt."
+#: ../data/gui/accounts_window.ui.h:13
+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."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "_Schlüssel wählen …"
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Klicken, um das Konto-Passwort zu ändern."
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
-msgstr "Klicken, um alle Kontakte eines anderen Kontos um Autorisierung zu fragen."
+msgstr ""
+"Klicken, um alle Kontakte eines anderen Kontos um Autorisierung zu fragen."
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Beim _Programmstart verbinden"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Persönliche Informationen bearbeiten …"
+#: ../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 "Vorname:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112
-#: ../src/notify.py:560
-#: ../src/notify.py:581
-#: ../src/notify.py:620
-#: ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52
-#: ../src/common/contacts.py:135
-#: ../src/dialogs.py:111
-#: ../src/dialogs.py:121
-#: ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Allgemein"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Server-Name: "
+#: ../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 ""
+"Falls aktiviert, sendet Gajim von mehreren anstatt von nur Ihrer eigenen IP-"
+"Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen Dateiübertragung "
+"erhöht wird."
 
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-msgstr "Falls aktiviert, sendet Gajim von mehreren anstatt von nur Ihrer eigenen IP-Adresse, wodurch die Wahrscheinlichkeit einer erfolgreichen Dateiübertragung erhöht wird."
+# TODO: GPG/PGP unification in original strings needed
+#: ../data/gui/accounts_window.ui.h:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie "
+"seahorse."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
-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:26
+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/glade/account_modification_window.glade.h:22
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Falls aktiviert, wird Gajim das Passwort mit ausschließlichen Lese-Rechten für Sie in ~/.gajim/config speichern."
+#: ../data/gui/accounts_window.ui.h:27
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Falls aktiviert, verbindet sich Gajim während des Startvorgangs automatisch "
+"mit diesem Konto."
 
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Falls aktiviert, verbindet sich Gajim während des Startvorgangs automatisch mit diesem Konto."
+#: ../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 ""
+"Falls aktiviert, wird mit jeder Änderung des globalen Status (verwaltet von "
+"der Auswahlbox unter der Kontaktliste) auch der Status dieses Kontos "
+"entsprechend geändert."
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "Falls aktiviert, wird mit jeder Änderung des globalen Status (verwaltet von der Auswahlbox unter der Kontaktliste) auch der Status dieses Kontos entsprechend geändert."
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Informationen über Sie, die auf dem Server gespeichert sind"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35
-#: ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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-ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Nachname:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Konten _zusammenführen"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Kein Schlüssel ausgewählt"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3
-#: ../src/config.py:1158
-#: ../src/config.py:1261
-#: ../src/config.py:1550
-#: ../src/config.py:1555
-#: ../src/config.py:2103
-#: ../src/config.py:2182
-#: ../src/config.py:2195
-#: ../src/config.py:3396
-#: ../src/config.py:3469
-#: ../src/dialogs.py:308
-#: ../src/dialogs.py:310
-#: ../src/dialogs.py:513
-#: ../src/dialogs.py:526
-#: ../src/roster_window.py:2800
-#: ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Kein Proxy"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Persönliche Informationen"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_tät:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The 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: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 ""
+"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/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
-msgstr "Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
+msgstr ""
+"Falls aktiviert, ändert sich die Priorität automatisch gemäß dem Status."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "_Umbenennen"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Ressour_ce:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the 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/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "_Passphrase speichern (unsicher)"
+#: ../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 ""
+"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/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Unterhaltungsver_lauf für alle Kontakte dieses Kontos speichern"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Keepalive-Pakete senden"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "_Keepalive-Pakete senden"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Konto-Status mit globalem Status synch_ronisieren"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Kontakte synchronisieren"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "_SSL verwenden (veraltet)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Dateiübertragungs-Proxys verwenden"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "Mit Status _abgleichen"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Name:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "Mit Status _abgleichen"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Konten"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anonyme Authentifizierung"
-
-#: ../data/glade/accounts_window.glade.h:13
-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."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Beim _Programmstart verbinden"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Vorname:"
-
-# TODO: GPG/PGP unification in original strings needed
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Falls aktiviert, bezieht Gajim das Passwort von einem GPG-Agenten wie seahorse."
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Nachname:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Konten _zusammenführen"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42
-#: ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "_Umbenennen"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "_Keepalive-Pakete senden"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Konto-Status mit globalem Status synchroni_sieren"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Kontakte synchronisieren"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "G_PG Schlüsselverwaltung verwenden"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Benutzerdefinierten Rechnernamen und P_ort verwenden"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Benutzerdefinierten P_ort verwenden:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Dateiübertragungs-Proxys verwenden"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "Persönliche Informationen b_earbeiten …"
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "Aktivi_eren"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "Rec_hnername: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Verwalten …"
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port: "
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Warnen, bevor eine unsichere Verbindung verwendet wird"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "Umgebungsvariable HTTP__PROXY ben_utzen"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Konto:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -602,7 +476,7 @@ msgstr ""
 "Protokoll hinzufügen zu können. Klicken\n"
 "Sie auf Registrieren, um fortzufahren."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -610,409 +484,468 @@ msgstr ""
 "Sie müssen mit dem Transport verbunden sein, um einen\n"
 "Kontakt über dieses Protokoll hinzufügen zu können."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "Spitz_name:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokoll:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registrieren"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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 "Ben_utzer-ID:"
 
-#: ../data/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Es ist ein Fehler aufgetreten:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../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>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc Befehle - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Noch einmal überprüfen"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Fehlerbeschreibung …"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Bitte warten Sie, während die Befehlsliste empfangen wird …"
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Bitte warten Sie, während der Befehl gesendet wird …"
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Bitte warten …"
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Diese Jabber-Instanz zeigt keine Befehle an."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Beschreibung</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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."
+msgstr ""
+"<b>HINWEIS:</b> Sie sollten Gajim neu starten, damit alle Änderungen in "
+"Kraft treten."
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Erweiterter Konfigurationseditor"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Nachricht des Tages (MOTD) _löschen"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Löscht die Nachricht des Tages (MOTD)."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "_Privatsphären-Listen bearbeiten …"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
-msgstr "Sendet eine Nachricht an alle momentan angemeldeten Benutzer des Servers."
+msgstr ""
+"Sendet eine Nachricht an alle momentan angemeldeten Benutzer des Servers."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Nachricht des Tages (MOTD) setzen …"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Setzt die Nachricht des Tages (MOTD)."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "_XML-Konsole anzeigen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Nachricht des Tages (MOTD) aktualisieren …"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Aktualisiert die Nachricht des Tages (MOTD)."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "Servernachricht _senden …"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr " ein Fenster/Tab mit diesem Kontakt geöffnet "
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Aktionen</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Ereignisse</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Klänge</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Erweiterte Aktionen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Erweiterter Benachrichtigungseditor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Alle Status"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101
-#: ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Abwesend"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Beschäftigt "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../data/gui/advanced_notifications_window.ui.h:10
+#, fuzzy
+msgid "Contact Change Status "
+msgstr "Kontakt hat Status verändert"
+
+#: ../data/gui/advanced_notifications_window.ui.h:11
+#, fuzzy
+msgid "Contact Disconnected "
+msgstr "Kontakt nicht verbunden"
+
+#: ../data/gui/advanced_notifications_window.ui.h:12
 msgid "Don't have "
 msgstr "habe nicht "
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/gui/advanced_notifications_window.ui.h:13
+#, fuzzy
+msgid "File Transfer Finished"
+msgstr "Dateiübertragungen"
+
+#: ../data/gui/advanced_notifications_window.ui.h:14
+#, fuzzy
+msgid "File Transfer Request "
+msgstr "Anfrage zur Dateiübertragung"
+
+#: ../data/gui/advanced_notifications_window.ui.h:15
+#, fuzzy
+msgid "File Transfer Started "
+msgstr "Dateiübertragung gestoppt"
+
+#: ../data/gui/advanced_notifications_window.ui.h:16
+#, fuzzy
+msgid "Group Chat Message Highlight "
+msgstr "Hervorhebung von Chatraum-Nachrichten"
+
+#: ../data/gui/advanced_notifications_window.ui.h:17
+#, fuzzy
+msgid "Group Chat Message Received "
+msgstr "Chatraum-Nachricht empfangen"
+
+#: ../data/gui/advanced_notifications_window.ui.h:18
 msgid "Have "
 msgstr "habe "
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Einen Befehl ausführen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Nicht verfügbar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Einen oder mehrere spezielle Status …"
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Online / Frei zum Chatten"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Nachricht empfangen\n"
-"Kontakt abgemeldet\n"
-"Kontakt ändert Status\n"
-"Gruppenchat-Nachricht hervorgehoben\n"
-"Gruppenchat-Nachricht empfangen\n"
-"Anfrage zur Dateiübertragung\n"
-"Dateiübertragung begonnen\n"
-"Dateiübertragung beendet"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/gui/advanced_notifications_window.ui.h:25
+#, fuzzy
+msgid "Receive a Message"
+msgstr "Neue private Nachricht"
+
+#: ../data/gui/advanced_notifications_window.ui.h:26
 msgid "When "
 msgstr "Wenn "
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
-msgstr "_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der Taskleiste blinken zu lassen"
+#: ../data/gui/advanced_notifications_window.ui.h:27
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"_Aktivere den UrgencyHint des Fenstermanagers, um das Chatfenster in der "
+"Taskleiste blinken zu lassen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Deaktiviere sich von selbst öffnende Chatfenster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Deaktivere existierendes Popup-Fenster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Deaktivere existierenden Sound für dieses Ereignis"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Deaktiviere die Ereignisanzeige in der Kontaktliste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Deaktiviere die Ereignisanzeige im Systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informiere mich mit einem Popup-Fenster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "Ein _Chatfenster mit Benutzer öffnen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "Zeige Ereignis in der Kontaktli_ste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "Zeige Ereignisse im _Systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "und ich "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "Kontakte"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
-"Kontakt(e)\n"
-"Gruppe(n)\n"
-"Alle"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "für "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/gui/advanced_notifications_window.ui.h:41
+#, fuzzy
+msgid "group(s)"
+msgstr "Gruppen"
+
+#: ../data/gui/advanced_notifications_window.ui.h:42
 msgid "when I'm in"
 msgstr "wenn ich bin"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Eintrag:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Feed-Name:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Zuletzt geändert:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Neuer Eintrag empfangen"
 
-#: ../data/glade/atom_entry_window.glade.h:5
-#: ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Sie haben einen neuen Eintrag erhalten:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "blockierte Kontakte"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Nachricht:</b> "
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Aktivität setzen"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Setze Aktivität"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Nachricht:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Stimmung:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Zur Bestätigung erneut eingeben:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Neues Passwort eingeben:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
-#: ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Aktivität:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
-#: ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Stimmung:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Voreingestellte Nachrichten:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Als Voreinstellung speichern …"
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "_Chatraum betreten …"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "Nr."
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "Zur Kont_aktliste hinzufügen …"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "Jabber-ID/E-Mail-Adresse _kopieren"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "Link-Adresse _kopieren"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "E-Mail-Pr_ogramm öffnen"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "Link im Br_owser öffnen"
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "Chat _starten"
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Senden"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "_Einladen zu"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Freunde einladen!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "MUC-Server"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../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/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1020,274 +953,268 @@ msgstr ""
 "Sie möchten einen Multi-User-Chat beginnen.\n"
 "Bitte wählen Sie die Kontakte, die Sie einladen möchten"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Spezielle Be_nachrichtigung hinzufügen …"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Open_PGP-Schlüssel zuweisen …"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "B_efehl ausführen …"
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "_Gruppen bearbeiten …"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "_Einladen zu"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "_Kontakte einladen"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "Ent_fernen"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9
-#: ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Benu_tzerdefinierten Status senden"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Einzelne _Nachricht senden …"
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "_Datei senden …"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Benutzerdefinierten Avatar wählen …"
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "_Chat starten"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "ESession-Verschlüsselung aktivieren"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Open_PGP-Verschlüsselung aktivieren"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "Zur Kont_aktliste hinzufügen …"
+
+#: ../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"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370
-#: ../src/roster_window.py:5501
+#: ../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 "_Blockieren"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Verbiete dem Kontakt, meinen Status zu sehen"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21
-#: ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Verlauf"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignorieren"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "Kontakt _verwalten"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Umbenennen …"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Abonnement"
 
 # TODO: Review by german translators
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364
-#: ../src/roster_window.py:5498
+#: ../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 "_Entblocken"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "Ignorieren a_ufheben"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Bitte füllen Sie das Formular aus."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Chatraum-Einstellungen"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Gruppen bearbeiten"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESession</b>-Informationen)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Überprüfen"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Liste der verwendbaren Features:</b>"
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Features"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Dateiübertragung abbrechen"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Bricht die ausgewählte Dateiübertragung ab."
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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."
+msgstr ""
+"Bricht die ausgewählte Dateiübertragung ab und löscht die unvollständige "
+"Datei."
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Aufrä_umen"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Dateiübertragungen"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Versteckt das Fenster."
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Entferne Dateiübertragung aus der Liste"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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."
+msgstr ""
+"Entfernt beendete, abgebrochene und fehlgeschlagene Dateiübertragungen aus "
+"der Liste."
 
-#: ../data/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.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 "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:11
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Diese Aktion entfernt eine Dateiübertragung aus der Liste. Falls die "
+"Übertragung aktiv ist, wird sie erst gestoppt und anschließend entfernt."
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
-msgstr "Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
-
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Fortsetzen"
+msgstr ""
+"Zeige eine Popup-Benachrichtigung, wenn die Datei komplett übertragen wurde."
 
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "Be_nachrichtige mich, wenn die Dateiübertragung abgeschlossen ist"
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "Öffne _Ordner"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "Dateiübertragungs-Liste"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Tabellenfarben des Chat-Status</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Konto-Reihe\n"
-"Gruppen-Reihe\n"
-"Kontakt-Reihe\n"
-"Chat-Banner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Konto"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
-#: ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Fett"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Erstellen"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Schriftart:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajim-Design-Einstellungen"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Weg"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
-#: ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Gruppe"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
-#: ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1295,7 +1222,7 @@ msgstr ""
 "MUC\n"
 "Nachrichten"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1303,1465 +1230,1559 @@ msgstr ""
 "an MUC gerichtete\n"
 "Nachrichten"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Unterbrochen"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Text_farbe:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Schri_ftart:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Hintergrund:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Spitz_name ändern …"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "_Thema ändern …"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Chat_raum einrichten …"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4
-#: ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "Chatraum zu den Lesezeichen _hinzufügen"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Chatraum auflösen"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "Chatraum _verwalten"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "Beim Schließen _minimieren"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Benutzeraktionen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "_Datei senden"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Zur Kont_aktliste hinzufügen"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Rausschmeißen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Mitglied"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Besitzer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "Private Nachricht _senden"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Stimme verleihen"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Neue Nachricht"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Von"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Thema"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 msgid ""
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<b>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."
+"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/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Willkommen im Gajim-Verlaufsmanager</b></big>"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/glade/history_manager.glade.h:4
-#: ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Löschen"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Export"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim-Verlaufsmanager"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
+"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 ""
-"Dieser Log-Manager ist nicht zum Ansehen der Logeinträge gedacht. Wenn Sie nach einer solchen Funktion suchen, benutzen Sie sattdessen das Verlaufsfenster.\n"
+"Dieser Log-Manager ist nicht zum Ansehen der Logeinträge gedacht. Wenn Sie "
+"nach einer solchen Funktion suchen, benutzen Sie sattdessen das "
+"Verlaufsfenster.\n"
 "\n"
-"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."
+"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/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "Durch_suche Datenbank"
 
-#: ../data/glade/history_window.glade.h:1
-#: ../src/history_window.py:323
+#: ../data/gui/history_window.ui.h:1
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Alle Status"
+
+#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Unterhaltungsverlauf"
 
-#: ../data/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Jabber-ID oder Kontaktname eingeben\n"
-"Gruppenchat-Verlauf\n"
-"Gesamter Chatverlauf"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Name des Kontakts"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Gruppenchat"
+
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Suchen:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "Unterhaltungsver_lauf"
 
-# TODO: Synchronize with other strings concerning bookmarks
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Diesen Chatraum merken (Strg+B)"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Durchsuche"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
-#: ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Chatraum betreten"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:4
+#, fuzzy
+msgid "Join this room _automatically when I connect"
 msgstr "Betritt diesen Chatraum automatisch, wenn ich mich verbinde"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Spitzname:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Kürzlich:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Chatraum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9
-#: ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+# TODO: Synchronize with other strings concerning bookmarks
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Diesen Chatraum merken (Strg+B)"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Konten verwalten"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Automatisch verbinden"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Chatraum-Lesezeichen"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimieren bei automatischem Beitritt"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Status anzeigen:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
-#: ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Konfiguration des PEP-Dienstes"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Einstellen"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Eigenschaften</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Einstellungen</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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-Verbindung\n"
 "SOCKS5\n"
 "BOSH"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Proxy-Verwaltung"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Pass_wort:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Proxy-A_dresse:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Proxy-_Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "HTTP-Prox_y verwenden"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Authentifizierung _verwenden"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH-Adresse:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Name:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Art:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Kontakt zur Kontaktliste hinzufügen (Strg+D)"
-
-# TODO: Synchronize with other strings concerning bookmarks
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Diesen Chatraum speichern (Strg+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Chatverlauf anzeigen (Strg+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Thema des Chatraums ändern (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Spitzname ändern (Strg+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Weiteren Kontakt zur Unterhaltung einladen (Strg+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Datei senden (Strg+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Emoticons (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Schriftformatierung (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Liste erweiterter Funktionen anzeigen (Alt+D)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Benutzerprofil anzeigen (Strg+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr "Zwischen Audio-Sitzung umschalten"
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Senden"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Erweiterter Konfigurationseditor</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Anwendungen</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Aktionen</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatischer Status</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Chat-Aussehen</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Chatlinien-Farben</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Chatstatus-Benachrichtigungen</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Ereignisse</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Benutzerdefiniert</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Schrift</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Google-Mail-Optionen</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Voreingestellte Statusnachrichten</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<i>Privatsphäre</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Aussehen der Kontaktliste</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Statusnachrichten</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Themen</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Zweiter Vorname:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Benachrichtigungen</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Erweitert …"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Immer\n"
-"Nur beim Schreiben\n"
-"Deaktiviert"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Alle Status"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Erlaube das Senden von Betriebssystem-Inf_ormation"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Erlaube das Senden von Betriebssystem-Inf_ormation"
+
+#: ../data/gui/preferences_window.ui.h:28
 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"
+msgstr ""
+"Popups/Benachrichtigungen zulassen, wenn ich _abwesend/nicht verfügbar/"
+"beschäftigt/unsichtbar bin"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Soundausgabe erlauben, wenn ich _beschäftigt bin"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Abwesend"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Immer OS/X-Standardprogramme verwenden"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Immer OS/X-Standardprogramme verwenden"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Immer OS/X-Standardprogramme verwenden"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Erfrage Statusnachricht beim:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr "Audio / Video"
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Bei jedem Programmstart automatisch erkennen\n"
-"Immer die GNOME-Standard-Anwendungen verwenden\n"
-"Immer die KDE-Standard-Anwendungen verwenden\n"
-"Immer die Xfce-Standard-Anwendungen verwenden\n"
-"Benutzerdefiniert"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "Beim Pr_ogrammstart verbinden"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Chat-Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Beim Starten überprüfen, ob Gajim der _Standard-Jabber-Client ist"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Erstellen"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Farben und Schriftarten für die Oberfläche konfigurieren"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Contact's message:"
 msgstr "Nachricht des Kontakts:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Contact's nickname:"
 msgstr "Spitzname des Kontakts:"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Benutzerdefiniert"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
 msgstr ""
-"separate Kontaktliste mit getrennter Unterhaltung\n"
-"separate Kontaktliste mit Einzelunterhaltung\n"
-"Einzelfenster\n"
-"separate Kontaktliste gruppiert nach Benutzerkonto\n"
-"separate Kontaktliste gruppiert nach Typ"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Deaktiviert"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "_Aktivitäten von Kontakten in der Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Zusätzliche _E-Mail-Details anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "_Stimmungen anzeigen"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Die gerade abgespielten Musik_titel anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "A_vatare der Kontakte in der Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "_Stimmungen anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Status_nachrichten anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:49
-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."
+#: ../data/gui/preferences_window.ui.h:58
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim kann Zusatzinformationen zu einer Unterhaltung empfangen und "
+"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
+"in Ihrem Chatfenster anzeigt werden sollen."
 
-#: ../data/glade/preferences_window.glade.h:50
-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."
+#: ../data/gui/preferences_window.ui.h:59
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim kann Zusatzinformationen zu einer Unterhaltung empfangen und "
+"versenden. Hier können Sie festlegen, welche Chatstatus-Benachrichtigungen "
+"Sie Ihrem Gegenüber senden möchten."
 
-#: ../data/glade/preferences_window.glade.h:51
-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:60
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim informiert Sie über ein Popup-Fenster in der rechten unteren "
+"Bildschirmecke über Kontakte, die sich gerade abgemeldet haben."
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Versteckt alle Schaltflächen im Chatfenster"
 
-#: ../data/glade/preferences_window.glade.h:54
-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:63
+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/glade/preferences_window.glade.h:55
-msgid "If checked, Gajim will also include information about the sender of the new emails"
-msgstr "Falls aktiviert, fügt Gajim auch Informationen über den Absender neuer E-Mails hinzu."
+#: ../data/gui/preferences_window.ui.h:64
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Falls aktiviert, fügt Gajim auch Informationen über den Absender neuer E-"
+"Mails hinzu."
+
+#: ../data/gui/preferences_window.ui.h:65
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Falls aktiviert, wird der Status in Abwesend geändert, wenn der Computer "
+"nicht genutzt wird."
 
-#: ../data/glade/preferences_window.glade.h:56
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr "Falls aktiviert, wird der Status in Abwesend geändert, wenn der Computer nicht genutzt wird."
+#: ../data/gui/preferences_window.ui.h:66
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+"Falls aktiviert, wird der Status in Nicht Verfügbar geändert, wenn der "
+"Computer längere Zeit nicht genutzt wird."
 
-#: ../data/glade/preferences_window.glade.h:57
-msgid "If checked, Gajim will change status to Not Available when the computer has not been used even longer"
-msgstr "Falls aktiviert, wird der Status in Nicht Verfügbar geändert, wenn der Computer längere Zeit nicht genutzt wird."
+#: ../data/gui/preferences_window.ui.h:67
+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/glade/preferences_window.glade.h:58
-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:68
+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/glade/preferences_window.glade.h:59
-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:69
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Falls aktiviert, wird die Aktivität der Kontakte in der Kontaktliste "
+"angezeigt."
 
-#: ../data/glade/preferences_window.glade.h:60
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Falls aktiviert, wird die Aktivität der Kontakte in der Kontaktliste angezeigt."
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Falls aktiviert, wird die Stimmung der Kontakte in der Kontaktliste "
+"angezeigt."
 
-#: ../data/glade/preferences_window.glade.h:61
-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:71
+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/glade/preferences_window.glade.h:62
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Falls aktiviert, wird der gerade abgespielte Musiktitel der Kontakte in der Kontaktliste angezeigt."
+#: ../data/gui/preferences_window.ui.h:72
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Falls aktiviert, wird der gerade abgespielte Musiktitel der Kontakte in der "
+"Kontaktliste angezeigt."
 
-#: ../data/glade/preferences_window.glade.h:63
-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: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 ""
+"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/glade/preferences_window.glade.h:64
-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: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 ""
+"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/glade/preferences_window.glade.h:65
-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:75
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"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/glade/preferences_window.glade.h:66
-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:76
+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/glade/preferences_window.glade.h:67
-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 "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: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 ""
+"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/glade/preferences_window.glade.h:68
-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:78
+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/glade/preferences_window.glade.h:69
-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:79
+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/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "V_erschlüsselte Sitzungen aufzeichnen"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Nachrichtenfenster _kompakt anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Verwalte_n …"
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Niemals\n"
-"Nur bei neuen Ereignissen\n"
-"Immer"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Server"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Benachrichtigungen"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Benachr_ichtigen, wenn sich ein Kontakt anmeldet"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Benachrichtigen, wenn sich ein K_ontakt abmeldet"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Bei neuen E-Mails bei _Google-Mail benachrichtigen"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Niemals\n"
+"Nur bei neuen Ereignissen\n"
+"Immer"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Persönliche Ereignisse"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Klänge ab_spielen"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
 msgstr ""
-"Chatfenster öffnen\n"
-"Benachrichtigung anzeigen\n"
-"Nur in der Kontaktliste anzeigen"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Einstellungen"
 
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Zeige Ereignis in der Kontaktli_ste"
+
 # FIXME: Check English. This should be called something like "Show systray icon"
 # because the systray itself is always visible.
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Symbol in der Systemleiste anzeigen:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../data/glade/preferences_window.glade.h:89
-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:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Einige Nachrichten können formatierten Inhalt enthalten (Farben, "
+"Schriftarten usw.). Falls aktiviert, wird Gajim nur den reinen "
+"Nachrichtentext anzeigen."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
-#: ../data/glade/preferences_window.glade.h:91
-#: ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Status-S_ymbole:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "D_esign:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
-"The auto away status message. If empty, Gajim will not change the current status message\n"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
-msgstr "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."
+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."
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
+"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."
+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."
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "_Transport-Symbole verwenden"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Benutze System-_Voreinstellung"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Wenn eine neue Nachricht empfangen wird:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your message:"
 msgstr "Deine Nachricht:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 msgid "Your nickname:"
 msgstr "Dein Spitzname:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "Automatisch _abwesend nach:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "Benachrichtigungen über _den Chatstatus anzeigen:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Dateimanager:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
-msgstr "Ereignisse von Kontakten, die nicht in der Kontaktliste sind, _ignorieren"
+msgstr ""
+"Ereignisse von Kontakten, die nicht in der Kontaktliste sind, _ignorieren"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "Formatierten Inhalt in ankommenden Nachrichten _ignorieren"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Logge die Statusveränderungen von Kontakten"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "E-_Mail-Programm:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "Automatisch _nicht verfügbar nach:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "Ö_ffnen …"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "Auf Standardfarben zu_rücksetzen"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "Benachrichtigungen über den Chatstatus _senden:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Statusnachricht:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "_URL hervorheben:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Fensterverhalten:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "in Chat_räumen"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "in der _Kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privatsphären-Liste:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Hinzufügen / Ändern einer Regel</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Liste aller Regeln</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privatsphären-Liste</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktiviert für diese Sitzung"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Bei jedem Programmstart aktiv"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "allen"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Alle (Abonnement eingeschlossen)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Erlaube"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Verbiete"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "der Jabber-ID:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Reihenfolge:"
 
-#: ../data/glade/privacy_list_window.glade.h:12
-#: ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Privatsphären-Liste"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "Kontakten, die:"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "allen in der Gruppe"
 
-# TODO: Review original string
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"nicht in Ihrer Liste stehen und in deren Liste Sie nicht stehen\n"
-"in Ihrer Liste stehen und in deren Liste Sie stehen\n"
-"nicht in Ihrer Liste stehen, in deren Liste Sie aber stehen\n"
-"in Ihrer Liste stehen, in deren Liste Sie aber nicht stehen"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Beide"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Von"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "Eins"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "Zwei"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "mir Nachrichten zu senden"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "mir Anfragen zu schicken"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "mir seinen/ihren Status zu senden"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "meinen Status zu sehen"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresse</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Birthday:</b>"
 msgstr "<b>Geburtstag:</b>"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Stadt:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Abteilung:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Zusatzadresse:</b>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Nachname:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Vollständiger Name</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Vorname:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Homepage:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Zweiter Vorname:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Name:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Spitzname:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Position:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Postleitzahl:</b>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Namenspräfix:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
-#: ../src/vcard.py:332
+#: ../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>Rolle:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Bundesland:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Straße:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Namenszusatz:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Über"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Hier klicken, um den Avatar zu auszuwählen."
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: JJJJ-MM-TT"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Persönliche Details"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Arbeit"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Kont_o entfernen (nur in Gajim)"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Konto entfernen (in Gajim und auf dem _Server)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380
-#: ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
-msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
-msgstr "<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:1
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
+msgstr ""
+"<b>jemand@irgendwo.de</b> möchte Sie als Kontakt zu seiner Kontaktliste "
+"<b>hinzufügen</b>."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
-msgstr "Nachrichtenkörper <gegenwärtig unbenutzt, so dass er standardmäßig versteckt wird>"
+msgstr ""
+"Nachrichtenkörper <gegenwärtig unbenutzt, so dass er standardmäßig versteckt "
+"wird>"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Austausch der Kontaktlistenelemente"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "_Kontakt hinzufügen …"
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Fea_tures"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Dateiübertragungen"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Häufig gestellte Fragen (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Online-Hilfe"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil und A_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Nur _aktive Kontakte anzeigen"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Trans_porte anzeigen"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Abgemeldete K_ontakte anzeigen"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "_Kontaktliste anzeigen"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Konten"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Aktionen"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "In_halte"
-
-#: ../data/glade/roster_window.glade.h:18
-#: ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "Änd_ern"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Einstellungen"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Beenden"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Einzelne _Nachricht senden …"
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "A_nsicht"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../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/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Suche"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Kontakt hinzufügen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4
-#: ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Informationen"
 
-#: ../data/glade/search_window.glade.h:5
-#: ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Suche"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "L_os"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registrieren auf"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "Abbre_chen"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Von:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Nachricht beantworten"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Sen_den"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Nachricht senden"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Nachricht senden und Fenster schließen"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Betreff:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "An:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "Antwo_rten"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Senden & Schließen"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_torisieren"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Autorisierung des Kontakts verweigern, so dass er Ihren Status nicht sehen kann"
+#: ../data/gui/subscription_request_window.ui.h:3
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Autorisierung des Kontakts verweigern, so dass er Ihren Status nicht sehen "
+"kann"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Abonnementanfrage"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Ablehnen"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Das Konto auswählen, das Sie synchronisieren möchten"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronisieren: Kontakte auswählen"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Klänge stummschalten"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Einzelne Nachricht _senden"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Zeige alle neuen _Ereignisse"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Gruppenchat"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Anfrage:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Client:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Uhrzeit beim Kontakt:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber-ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressource:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abonnement:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Kommentare"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Gewählter Avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Kontaktinformationen"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Mehr"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Avatar auswählen"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Schrift</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber-Datentransfer</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML-Direkteingabe</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktivieren"
+#: ../data/gui/xml_console_window.ui.h:4
+msgid "Hide IN stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:5
+msgid "Hide IQ stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_Info/Query"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Anwesenheit"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Konto bearbeiten …"
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lokale Jabber-ID:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Persönlich"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Ressource:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Ein Jabber-Client in GTK+"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Bestätigung abbrechen"
 
-#: ../src/adhoc_commands.py:296
-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:299
+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:328
-#: ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Der Dienst sendete unzureichende Daten."
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Der Dienst änderte die Sitzungskennung."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Der Dienst gab einen Fehler zurück."
 
@@ -2786,8 +2807,7 @@ msgstr "Ganzzahl"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96
-#: ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Farbe"
 
@@ -2924,148 +2944,142 @@ msgstr "Schwedisch"
 msgid "Chinese (Ch)"
 msgstr "Chinesisch"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Sprache für die Rechtschreibprüfung"
 
 #. we are not connected
-#: ../src/chat_control.py:478
-#: ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/chat_control.py:479
-#: ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Durchgestrichen"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Formatierung löschen"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Datei wirklich senden?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr "Wenn Sie eine Datei an %s senden, wird der Kontakt Ihre echte Jabber-ID kennen."
+msgstr ""
+"Wenn Sie eine Datei an %s senden, wird der Kontakt Ihre echte Jabber-ID "
+"kennen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1411
-#: ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG-Verschlüsselung aktiviert"
 
 #. Add to roster
-#: ../src/chat_control.py:1436
-#: ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253
-#: ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060
-#: ../src/dialogs.py:1973
-#: ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610
-#: ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398
-#: ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578
-#: ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194
-#: ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Nicht in der Kontaktliste"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Der Kontakt unterstützt keine Dateiübertragung."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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."
+msgstr ""
+"Sie müssen die JID des Kontakts kennen, um ihm oder ihr eine Datei zu senden."
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "%(type)s Status: %(state)s, Grund: %(reason)s"
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844
-#: ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Kein GPG-Schlüssel zugewiesen"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/chat_control.py:1845
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-msgstr "Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht mit GPG verschlüsselt werden."
+#: ../src/chat_control.py:1928
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+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:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Sitzung WIRD aufgezeichnet"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Sitzung WIRD NICHT aufgezeichnet"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "ist"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "ist NICHT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "wird"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "wird NICHT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "und authentifiziert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3074,176 +3088,187 @@ msgstr ""
 "%(type)s Verschlüsselung %(status)s aktiv %(authenticated)s.\n"
 "Ihre Chatsitzung %(logged)s mitgeschrieben."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Sitzungsaushandlung abgebrochen"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Diese Sitzung ist verschlüsselt"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " und wird AUFGEZEICHNET"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " und wird NICHT AUFGEZEICHNET"
 
-#: ../src/chat_control.py:2074
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "Die Identität des Gesprächspartners wurde nicht überprüft. Mehr Informationen durch Klicken auf das Schild-Symbol."
+#: ../src/chat_control.py:2158
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"Die Identität des Gesprächspartners wurde nicht überprüft. Mehr "
+"Informationen durch Klicken auf das Schild-Symbol."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E-Verschlüsselung deaktiviert"
 
-#: ../src/chat_control.py:2113
-#: ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Die folgende Nachricht wurde UNVERSCHLÜSSELT übertragen"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\" erhalten"
 
-#: ../src/chat_control.py:2389
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die Nachricht verloren."
-
-#: ../src/chat_control.py:2542
-#: ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483
-#: ../src/common/connection.py:420
-#: ../src/gajim.py:154
-#: ../src/session.py:134
+#: ../src/chat_control.py:2476
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Wenn Sie das Fenster schließen und der Verlauf abgeschaltet ist, geht die "
+"Nachricht verloren."
+
+#: ../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
 msgid "Database Error"
 msgstr "Datenbankfehler"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-msgstr "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu reparieren oder zu löschen (dabei gehen alle Verläufe verloren)."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+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:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ist jetzt %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:129
-#: ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "Erstelle Log-Datenbank"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130
-#: ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148
-#: ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Ändere Statusinformation"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Status ändern"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Status und Beschreibung festlegen"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Längere Zeit abwesend"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Bitte nicht stören"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Offline - Abgemeldet"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Statusbeschreibung:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Der Status hat sich verändert."
 
-#: ../src/common/commands.py:176
-#: ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Verlasse Chaträume"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s aus dem Chatraum %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Sie sind derzeit in keinem Chatraum."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205
-#: ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55
-#: ../src/roster_window.py:809
-#: ../src/roster_window.py:1580
-#: ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Gruppenchat"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Sie haben folgende Chaträume verlassen:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Ungelesene Nachrichten weiterleiten"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Alle ungelesenen Nachrichten wurden weitergeleitet."
 
@@ -3253,11 +3278,14 @@ msgstr "Klang abspielen, wenn der Benutzer beschäftigt ist"
 
 #: ../src/common/config.py:76
 msgid "Use D-Bus and Notification-Daemon to show notifications"
-msgstr "Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
+msgstr ""
+"Verwende D-Bus und Notification-Daemon, um Benachrichtigungen zu zeigen"
 
 #: ../src/common/config.py:78
 msgid "Show only online and free for chat contacts in roster."
-msgstr "Nur die Kontakte in der Kontaktliste anzeigen, die Verfügbar oder Frei zum Chatten sind."
+msgstr ""
+"Nur die Kontakte in der Kontaktliste anzeigen, die Verfügbar oder Frei zum "
+"Chatten sind."
 
 #: ../src/common/config.py:81
 msgid "Time in minutes, after which your status changes to away."
@@ -3269,7 +3297,9 @@ msgstr "$S (Abwesend wegen Untätigkeit für mehr als $T Minuten)"
 
 #: ../src/common/config.py:82
 msgid "$S will be replaced by current status message, $T by autoaway time."
-msgstr "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Abwesenheitszeit."
+msgstr ""
+"$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die "
+"Abwesenheitszeit."
 
 #: ../src/common/config.py:84
 msgid "Time in minutes, after which your status changes to not available."
@@ -3281,12 +3311,16 @@ msgstr "$S (Nicht verfügbar wegen Untätigkeit seit mehr als $T Minuten)"
 
 #: ../src/common/config.py:85
 msgid "$S will be replaced by current status message, $T by autoxa time."
-msgstr "$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-Verfügbar-Zeit."
+msgstr ""
+"$S wird mit der aktuellen Statusnachricht ersetzt, $T durch die Nicht-"
+"Verfügbar-Zeit."
 
 # FIXME: Check English
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
-msgstr "Legt fest, wann das Systemleisten-Symbol angezeigt wird. Mögliche Werte: 'never', 'on_event', 'always'."
+msgstr ""
+"Legt fest, wann das Systemleisten-Symbol angezeigt wird. Mögliche Werte: "
+"'never', 'on_event', 'always'."
 
 #: ../src/common/config.py:93
 msgid "Incoming nickname color."
@@ -3329,16 +3363,16 @@ msgid "Status message text font."
 msgstr "Schriftart der Statusnachricht"
 
 #: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
-msgstr "Liste (getrennt durch Leerzeichen) von Zeilen (Konten und Gruppen), die eingeklappt sind."
+msgid ""
+"List (space separated) of rows (accounts and groups) that are collapsed."
+msgstr ""
+"Liste (getrennt durch Leerzeichen) von Zeilen (Konten und Gruppen), die "
+"eingeklappt sind."
 
 #. sorted alphanum
-#: ../src/common/config.py:106
-#: ../src/common/config.py:482
-#: ../src/common/optparser.py:288
-#: ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499
-#: ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "Standard"
 
@@ -3357,32 +3391,64 @@ msgstr ""
 "'never' - Zeige nie die Zeit."
 
 #: ../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 "Zeige die Zeit in Chats mittels ungenauer Uhr an. Werte für die Ungenauigkeit sind 1 bis 4, je höher, desto ungenauer. 0 deaktiviert die ungenaue Uhr. Die ungenaue Uhr wird nur verwendet, wenn print_time auf 'sometimes' gesetzt ist."
+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 ""
+"Zeige die Zeit in Chats mittels ungenauer Uhr an. Werte für die "
+"Ungenauigkeit sind 1 bis 4, je höher, desto ungenauer. 0 deaktiviert die "
+"ungenaue Uhr. Die ungenaue Uhr wird nur verwendet, wenn print_time auf "
+"'sometimes' gesetzt ist."
 
 #: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandle * / _ Paare als mögliche Formatierungszeichen."
 
 #: ../src/common/config.py:118
-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."
+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: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 "Verwendet ReStructuredText als Text-Markup für HTML und ASCII-Formatierung, falls aktiviert. Informationen zur Syntax finden Sie unter http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch). (Falls Sie dieses Feature benutzen möchten, installieren Sie 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 ""
+"Verwendet ReStructuredText als Text-Markup für HTML und ASCII-Formatierung, "
+"falls aktiviert. Informationen zur Syntax finden Sie unter http://docutils."
+"sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch). (Falls Sie "
+"dieses Feature benutzen möchten, installieren Sie docutils.)"
 
 #: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Zeichen, das hinter Spitznamen angezeigt wird, wenn die Spitznamenvervollständigung (Tab) in Chaträumen verwendet wird."
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Zeichen, das hinter Spitznamen angezeigt wird, wenn die "
+"Spitznamenvervollständigung (Tab) in Chaträumen verwendet wird."
 
 #: ../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 "Zeichen, das an den gewünschten Spitznamen gehängt wird, falls der dieser im Chatraum bereits vergeben ist."
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+msgstr ""
+"Zeichen, das an den gewünschten Spitznamen gehängt wird, falls der dieser im "
+"Chatraum bereits vergeben ist."
 
 #: ../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 "Hiermit lässt sich der Zeitstempel anpassen, der in den Unterhaltungen verwendet wird. Zum Beispiel wird \"[%H:%M] \" zu \"[Stunde:Minute] \". Weitere Informationen finden Sie in der Python-Dokumentation zu \"strftime\" unter http://docs.python.org/lib/module-time.html (Englisch)."
+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 ""
+"Hiermit lässt sich der Zeitstempel anpassen, der in den Unterhaltungen "
+"verwendet wird. Zum Beispiel wird \"[%H:%M] \" zu \"[Stunde:Minute] \". "
+"Weitere Informationen finden Sie in der Python-Dokumentation zu \"strftime\" "
+"unter http://docs.python.org/lib/module-time.html (Englisch)."
 
 #: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
@@ -3397,28 +3463,46 @@ msgid "Add * and [n] in roster title?"
 msgstr "Sollen * und [n] in den Titel der Kontaktleiste eingefügt werden?"
 
 #: ../src/common/config.py:166
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Wie viele Zeilen von der vorherigen Unterhaltung angezeigt werden, wenn ein Tab/Fenster wieder geöffnet wird."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Wie viele Zeilen von der vorherigen Unterhaltung angezeigt werden, wenn ein "
+"Tab/Fenster wieder geöffnet wird."
 
 #: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
-msgstr "Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
+msgstr ""
+"Wie viele Minuten die Zeilen vom vorherigen Chat angezeigt werden sollen."
 
 #: ../src/common/config.py:168
 msgid "How many lines to request to server when entering a groupchat."
-msgstr "Wie viele zurückliegende Chatzeilen sollen beim Betreten eines Gruppenchats abgefragt werden?"
+msgstr ""
+"Wie viele zurückliegende Chatzeilen sollen beim Betreten eines Gruppenchats "
+"abgefragt werden?"
 
 #: ../src/common/config.py:169
 msgid "How many minutes back to request logs when a entering a groupchat."
-msgstr "Wie viele Minuten zurück soll das Logfile beim Betreten eines Gruppenchats abgefragt werden?"
+msgstr ""
+"Wie viele Minuten zurück soll das Logfile beim Betreten eines Gruppenchats "
+"abgefragt werden?"
 
 #: ../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."
-msgstr "Wie viele Sekunden soll gewartet werden, bevor ein Gruppenchat wieder automatisch betreten wird, von dem Sie getrennt worden sind? Setze den Wert auf 0, um das automatische Betreten zu deaktivieren."
+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 ""
+"Wie viele Sekunden soll gewartet werden, bevor ein Gruppenchat wieder "
+"automatisch betreten wird, von dem Sie getrennt worden sind? Setze den Wert "
+"auf 0, um das automatische Betreten zu deaktivieren."
 
 #: ../src/common/config.py:172
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch (Standardeinstellung im ICQ-Client Mirabilis)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
+"(Standardeinstellung im ICQ-Client Mirabilis)."
 
 #: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -3426,48 +3510,90 @@ msgstr "Wie viele Zeilen für Strg+BildAuf gespeichert werden."
 
 #: ../src/common/config.py:177
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-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."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+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:180
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
-msgstr "Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert werden."
+msgstr ""
+"Falls aktiviert, kann Gajim von außerhalb mittels gajim-remote kontrolliert "
+"werden."
 
 #: ../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."
-msgstr "Falls aktiviert, wird auf D-Bus-Signale vom NetworkManager reagiert und der Status wird abhängig vom Status der Netzwerkverbindung gesetzt (vorausgesetzt, Sie haben listen_to_network_manager nicht auf False gesetzt und Ihre Konten synchronisieren sich mit dem globalen Status)."
+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 ""
+"Falls aktiviert, wird auf D-Bus-Signale vom NetworkManager reagiert und der "
+"Status wird abhängig vom Status der Netzwerkverbindung gesetzt "
+"(vorausgesetzt, Sie haben listen_to_network_manager nicht auf False gesetzt "
+"und Ihre Konten synchronisieren sich mit dem globalen Status)."
 
 #: ../src/common/config.py:182
-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."
+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:183
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Angezeigte Chatstatus-Benachrichtigungen im Chatfenster. Kann auf \"all\", \"composing_only\" oder \"disabled\" gesetzt werden."
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Angezeigte Chatstatus-Benachrichtigungen im Chatfenster. Kann auf \"all\", "
+"\"composing_only\" oder \"disabled\" gesetzt werden."
 
 #: ../src/common/config.py:185
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "Wenn die Uhrzeit nicht für jede Nachricht angezeigt werden soll (print_time==sometimes), wird sie alle x Minuten angezeigt."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+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:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Chatraum-Tab oder -Fenster geschlossen wird."
 
 #: ../src/common/config.py:187
-msgid "Always ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Immer fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"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:188
-msgid "Never ask before closing group chat tab/window in this space separated list of group chat jids."
-msgstr "Niemals fragen, bevor ein Chatraum-Tab oder -Fenster aus dieser Liste von Gruppchatnamen geschlossen wird (Namen getrennt durch Leerzeichen)."
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"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: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)"
-msgstr "Frage bevor ein Chatfenster mit mehreren Tabs geschlossen wird, wenn dadurch Daten verloren gehen würden (Chat, Privatchat, nicht minimierter Gruppenchat)"
+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 ""
+"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: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."
-msgstr "Kommagetrennte Liste von vollständigen Hostnamen oder IP-Adressen, die bei Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Rechnernamen gesendet werden."
+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 ""
+"Kommagetrennte Liste von vollständigen Hostnamen oder IP-Adressen, die bei "
+"Dateiübertragung mit NAT/Port-Freigabe zusätzlich zum lokalen Rechnernamen "
+"gesendet werden."
 
 #: ../src/common/config.py:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -3490,524 +3616,741 @@ msgid "Show close button in tab?"
 msgstr "Schließen-Schaltflächen in Tabs anzeigen?"
 
 #: ../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."
-msgstr "Eine Liste von MODP-Gruppen, die im Diffie-Hellman-Schlüsselaustausch benutzt werden sollen. Priorität nach Nennungsreihenfolge, getrennt durch Kommata. Zulässige Gruppen sind 1, 2, 5, 14, 15, 16, 17 und 18. Größere Werte sind sicherer, benötigen jedoch beim Start einer neuen Unterhaltung mehr Rechenzeit."
+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 ""
+"Eine Liste von MODP-Gruppen, die im Diffie-Hellman-Schlüsselaustausch "
+"benutzt werden sollen. Priorität nach Nennungsreihenfolge, getrennt durch "
+"Kommata. Zulässige Gruppen sind 1, 2, 5, 14, 15, 16, 17 und 18. Größere "
+"Werte sind sicherer, benötigen jedoch beim Start einer neuen Unterhaltung "
+"mehr Rechenzeit."
 
 #: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Vorschau neuer Nachrichten in der Popup-Benachrichtigung anzeigen?"
 
 #: ../src/common/config.py:219
-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."
+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: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."
-msgstr "Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers geklickt wird. Diese Option funktioniert nur, wenn das Trayicon verwendet wird."
+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 ""
+"Falls aktiviert, wird Gajim beendet, wenn der X-Button des Fenstermanagers "
+"geklickt wird. Diese Option funktioniert nur, wenn das Trayicon verwendet "
+"wird."
 
 #: ../src/common/config.py:221
-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."
+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:222
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-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."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+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:223
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window."
-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:228
-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."
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+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:229
-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 "Falls aktiviert, wird jeder Kontakt, der beim letzten Mal keinen Avatar hatte oder dessen gespeicherter Avatar zu alt ist, nach einem neuen gefragt."
+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:230
-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 "Falls deaktiviert, wird keine Statuszeile im Chat angezeigt, wenn ein Kontakt seinen Status oder seine Statusnachricht ändert."
+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 ""
+"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:231
-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 "Kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", werden keine Status-Zeilen mehr in Chaträumen angezeigt, wenn jemand seinen Status oder seine Statusnachricht ändert. Falls \"all\", werden alle Statusnachrichten anzeigt. Falls \"in_and_out\", wird nur dann ein Status angezeigt, wenn jemand den Chatraum betritt oder verlässt."
+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 ""
+"Falls deaktiviert, wird keine Statuszeile im Chat angezeigt, wenn ein "
+"Kontakt seinen Status oder seine Statusnachricht ändert."
+
+#: ../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."
+msgstr ""
+"Kann \"none\", \"all\" oder \"in_and_out\" sein. Falls \"none\", werden "
+"keine Status-Zeilen mehr in Chaträumen angezeigt, wenn jemand seinen Status "
+"oder seine Statusnachricht ändert. Falls \"all\", werden alle "
+"Statusnachrichten anzeigt. Falls \"in_and_out\", wird nur dann ein Status "
+"angezeigt, wenn jemand den Chatraum betritt oder verlässt."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade angemeldet haben."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Hintergrundfarbe von Kontakten, wenn sie sich gerade abgemeldet haben."
 
-#: ../src/common/config.py:236
-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:237
+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:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Zeige keinen Avatar für den Transport selbst an."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Kontaktliste nicht in der Taskleiste anzeigen."
 
-#: ../src/common/config.py:239
-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 "Falls aktiviert blitzt das Fenster bei neuen Ereignissen auf, wenn neue Ereignisse anstehen (Standardverhalten der meisten Fenster-Manager; benötigt GTK+ und PyGTK >= Version 2.8)."
+#: ../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."
+msgstr ""
+"Falls aktiviert blitzt das Fenster bei neuen Ereignissen auf, wenn neue "
+"Ereignisse anstehen (Standardverhalten der meisten Fenster-Manager; benötigt "
+"GTK+ und PyGTK >= Version 2.8)."
 
-#: ../src/common/config.py:241
-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 verarbeitet keine SHA-Informationen, wenn ein passwortgeschützter Chatraum betreten wird. Falls aktiviert, werden in Chaträumen keine SHA-Informationen gesendet."
+#: ../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."
+msgstr ""
+"Jabberd1.4 verarbeitet keine SHA-Informationen, wenn ein passwortgeschützter "
+"Chatraum betreten wird. Falls aktiviert, werden in Chaträumen keine SHA-"
+"Informationen gesendet."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window along with the roster.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window."
 msgstr ""
 "Kontrolliert das Fenster, in dem neue Nachrichten angezeigt werden.\n"
 "'Immer' - Alle Nachrichten landen in einem einzigen Fenster.\n"
-"'Immer in der Kontaktliste' - Wie 'Immer', die Nachrichten teilen sich jedoch ein Fenster mit der Kontaktliste.\n"
+"'Immer in der Kontaktliste' - Wie 'Immer', die Nachrichten teilen sich "
+"jedoch ein Fenster mit der Kontaktliste.\n"
 "'Niemals' - Alle Nachrichten werden in eigenen Fenstern angezeigt.\n"
-"'Pro Konto' - Jedes Konto besitzt ein eigenes Fenster, in dem die Nachrichten angezeigt werden.\n"
-"'Pro Typ' - Jeder Nachrichtentyp (z.B. Chat oder Gruppenchat) landet in einem eigenen Fenster. Eine Änderung dieser Option tritt erst nach einem Neustart von Gajim in Kraft."
+"'Pro Konto' - Jedes Konto besitzt ein eigenes Fenster, in dem die "
+"Nachrichten angezeigt werden.\n"
+"'Pro Typ' - Jeder Nachrichtentyp (z.B. Chat oder Gruppenchat) landet in "
+"einem eigenen Fenster. Eine Änderung dieser Option tritt erst nach einem "
+"Neustart von Gajim in Kraft."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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."
+msgstr ""
+"Falls deaktiviert, wird der Avatar nicht mehr im Chatfenster angezeigt."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Versteckt die Schaltflächen im Chatraum-Fenster."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Versteckt das Banner im Chatraum-Fenster."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Versteckt das Banner im Zwei-Personen-Chatfenster."
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Versteckt die Benutzerliste im Chatraum-Fenster."
 
-#: ../src/common/config.py:251
-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 "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:252
-msgid "Indentation when using merge consecutive nickname."
-msgstr "Einrückung einfügen, wenn das Zusammenführen nachfolgender Spitznamen verwendet wird."
+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 ""
+"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:253
-msgid "Smooth scroll message in conversation window"
-msgstr "Sanften Bildlauf im Unterhaltungsfenster verwenden"
+msgid "Indentation when using merge consecutive nickname."
+msgstr ""
+"Einrückung einfügen, wenn das Zusammenführen nachfolgender Spitznamen "
+"verwendet wird."
 
 #: ../src/common/config.py:254
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "Liste der Farben, die zum Einfärben der Spitznamen in Chaträumen verwendet werden sollen (Werte getrennt durch \":\")."
+msgid "Smooth scroll message in conversation window"
+msgstr "Sanften Bildlauf im Unterhaltungsfenster verwenden"
 
 #: ../src/common/config.py:255
-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."
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Liste der Farben, die zum Einfärben der Spitznamen in Chaträumen verwendet "
+"werden sollen (Werte getrennt durch \":\")."
 
 #: ../src/common/config.py:256
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+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:257
-msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
-msgstr "Soll der Bestätigungsdialog zum Blockieren von Benutzern angezeigt werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+msgstr ""
+"Soll der Bestätigungsdialog beim Erstellen von Metakontakten angezeigt "
+"werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
 
 #: ../src/common/config.py:258
-msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
-msgstr "Soll der Bestätigungsdialog für den speziellen Chatstatus angezeigt werden? Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Soll der Bestätigungsdialog zum Blockieren von Benutzern angezeigt werden? "
+"Bei einer leeren Zeichenfolge wird der Dialog nie gezeigt."
 
 #: ../src/common/config.py:259
-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 "Falls aktiviert, können Sie eine negative Priorität im Konto-Bearbeiten-Fenster setzen. VORSICHT: Wenn Sie mit einer negativen Priorität angemeldet sind ehalten Sie keine Nachrichten mehr vom Server."
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+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:260
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, um die Passwörter der Konten zu speichern."
+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 ""
+"Falls aktiviert, können Sie eine negative Priorität im Konto-Bearbeiten-"
+"Fenster setzen. VORSICHT: Wenn Sie mit einer negativen Priorität angemeldet "
+"sind ehalten Sie keine Nachrichten mehr vom Server."
 
 #: ../src/common/config.py:261
-msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
-msgstr "Falls aktiviert, wird Gajim KDE Wallet (wenn kwalletcli verfügbar ist) um Kontopasswörter zu speichern."
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Falls aktiviert, wird der Gnome-Schlüsselbund (falls verfügbar) verwendet, "
+"um die Passwörter der Konten zu speichern."
 
 #: ../src/common/config.py:262
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Falls aktiviert, wird die Anzahl der angemeldeten und gesamten Kontakte in den Konto- und Gruppenreihen angezeigt."
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Falls aktiviert, wird Gajim KDE Wallet (wenn kwalletcli verfügbar ist) um "
+"Kontopasswörter zu speichern."
 
 #: ../src/common/config.py:263
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Kann leer, 'chat' oder 'normal' sein. Wenn nicht leer, werden alle eingehenden Nachrichten so behandelt, als wären sie vom gewählten Typ."
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Falls aktiviert, wird die Anzahl der angemeldeten und gesamten Kontakte in "
+"den Konto- und Gruppenreihen angezeigt."
 
 #: ../src/common/config.py:264
-msgid "If True, Gajim will scroll and select the contact who sent you the last message, if chat window is not already opened."
-msgstr "Falls aktiviert, wird Gajim automatisch zu der Person springen und diese auswählen, die die letzte Nachricht geschickt hat, falls das Chatfenster nicht bereits geöffnet ist."
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+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:265
-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 ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Falls aktiviert, wird Gajim automatisch zu der Person springen und diese "
+"auswählen, die die letzte Nachricht geschickt hat, falls das Chatfenster "
+"nicht bereits geöffnet ist."
 
 #: ../src/common/config.py:266
-msgid "Time of inactivity needed before the change status window closes down."
-msgstr "Wartezeit, bevor das \"Status ändern\"-Fenster automatisch geschlossen wird."
+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:267
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
-msgstr "Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten Zeilen werden gelöscht."
+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:268
-msgid "If True, notification windows from notification-daemon will be attached to systray icon."
-msgstr "Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst an das Systray-Icon angehängt."
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Maximale Anzahl Zeilen, die in einem Gespräch angezeigt werden. Die ältesten "
+"Zeilen werden gelöscht."
 
 #: ../src/common/config.py:269
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Legen Sie den Zeitabstand zwischen den Leerlaufüberprüfungen fest."
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+"Falls aktiviert, werden Benachrichtigungsfenster vom Benachrichtigungsdienst "
+"an das Systray-Icon angehängt."
 
 #: ../src/common/config.py:270
-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 "Choose interval between 2 checks of idleness."
+msgstr "Legen Sie den Zeitabstand zwischen den Leerlaufüberprüfungen fest."
 
 #: ../src/common/config.py:271
-msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
-msgstr "Gültige URI-Schemata. Nur Schemata in dieser Liste werden als \"wirkliche\" URIs akzeptiert. (mailto und xmpp werden separat behandelt)"
+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:272
-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 "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!"
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
+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:273
-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."
+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 ""
+"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:274
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
-msgstr "Wann die Reihe des Eigenkontakts angezeigt wird. Kann sein \"always\" (immer), \"when_other_resource\" (wenn eine andere Ressource online ist) oder \"never\" (niemals)"
+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:275
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+msgstr ""
+"Wann die Reihe des Eigenkontakts angezeigt wird. Kann sein \"always"
+"\" (immer), \"when_other_resource\" (wenn eine andere Ressource online ist) "
+"oder \"never\" (niemals)"
+
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+msgid "STUN server to use when using jingle"
+msgstr ""
 
-#: ../src/common/config.py:286
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Die Priorität ändert sich automatisch gemäß dem Status. Die Prioritäten werden in den \"autopriority_*\"-Optionen festgelegt."
+#: ../src/common/config.py:284
+msgid ""
+"If True, Gajim will show affiliation of groupchat occupants by adding a "
+"colored square to the status icon"
+msgstr ""
 
-#: ../src/common/config.py:294
-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 bei automatischer Verbindung. Mögliche Werte: Angemeldet, Frei zum Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar. (Diese Option kann nur verwendet werden, wenn \"restore_last_status\" deaktiviert ist.)"
+#: ../src/common/config.py:296
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Die Priorität ändert sich automatisch gemäß dem Status. Die Prioritäten "
+"werden in den \"autopriority_*\"-Optionen festgelegt."
 
-#: ../src/common/config.py:295
+#: ../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"
+msgstr ""
+"Status bei automatischer Verbindung. Mögliche Werte: Angemeldet, Frei zum "
+"Chatten, Abwesend , Nicht verfügbar, Beschäftigt, Unsichtbar. (Diese Option "
+"kann nur verwendet werden, wenn \"restore_last_status\" deaktiviert ist.)"
+
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
-msgstr "Falls aktiviert, wird die zuletzt eingestellte Statusmeldung verwendet."
+msgstr ""
+"Falls aktiviert, wird die zuletzt eingestellte Statusmeldung verwendet."
 
-#: ../src/common/config.py:297
-msgid "If True, Contacts requesting authorization will be automatically accepted."
-msgstr "Falls aktiviert, werden Authorisationsanfragen von Kontakten automatisch akzeptiert."
+#: ../src/common/config.py:307
+msgid ""
+"If True, Contacts requesting authorization will be automatically accepted."
+msgstr ""
+"Falls aktiviert, werden Authorisationsanfragen von Kontakten automatisch "
+"akzeptiert."
 
-#: ../src/common/config.py:298
-msgid "If False, this account will be disabled and will not appear in roster window."
-msgstr "Falls deaktiviert, wird das Konto deaktiviert und erscheint nicht in der Kontaktliste."
+#: ../src/common/config.py:308
+msgid ""
+"If False, this account will be disabled and will not appear in roster window."
+msgstr ""
+"Falls deaktiviert, wird das Konto deaktiviert und erscheint nicht in der "
+"Kontaktliste."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/common/config.py:301
-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:311
+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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiviere die ESession-Verschlüsselung für dieses Konto."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr "Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
+msgstr ""
+"Soll die ESession-Verschlüsselung automatisch gestartet werden, wenn möglich?"
 
-#: ../src/common/config.py:305
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
+#: ../src/common/config.py:315
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Geordnete Liste der auszuprobierenden Verbindungstypen (getrennt durch "
+"Leerzeichen). Mögliche Werte sind TLS, SSL und PLAIN."
 
-#: ../src/common/config.py:306
-msgid "Show a warning dialog before sending password on an plaintext connection."
-msgstr "Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung übertragen wird."
+#: ../src/common/config.py:316
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
+msgstr ""
+"Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
+"übertragen wird."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 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."
+msgstr ""
+"Warnmeldung anzeigen, bevor das Passwort über eine mit der Standard-SSL-"
+"Bibliothek geschützte Verbindung übertragen wird."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Warnmeldung anzeigen, bevor das Passwort über eine unsichere Verbindung "
+"übertragen wird."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
-msgstr "Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
+msgstr ""
+"Liste der SSL-Fehler, die zu ignorieren sind (getrennt durch Leerzeichen)."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Whitespace nach Untätigkeit gesendet"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP Ping nach Untätigkeit gesendet"
 
-#: ../src/common/config.py:323
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
-msgstr "Wie viele Sekunden soll auf die Wartezeit in Sekunden, bevor eine Verbindung wieder hergestellt wird."
+#: ../src/common/config.py:334
+msgid ""
+"How many seconds to wait for the answer of ping alive packet before we try "
+"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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2-Workaround"
 
-#: ../src/common/config.py:330
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-msgstr "Falls aktiviert, wird Gajim Ihre IP-Adresse und die in der file_transfer_proxies Option definierten Proxys für den Dateitransfer verwenden."
+#: ../src/common/config.py:341
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+msgstr ""
+"Falls aktiviert, wird Gajim Ihre IP-Adresse und die in der "
+"file_transfer_proxies Option definierten Proxys für den Dateitransfer "
+"verwenden."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Antwort auf Empfangsbestätigungsanfragen"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Empfangsbestätigungen anfordern"
 
-#: ../src/common/config.py:353
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Soll beim Aushandeln einer verschlüsselten Sitzung angenommen werden, dass Sie Ihre Nachrichten aufzeichnen wollen?"
+#: ../src/common/config.py:366
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Soll beim Aushandeln einer verschlüsselten Sitzung angenommen werden, dass "
+"Sie Ihre Nachrichten aufzeichnen wollen?"
+
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Bitte geben Sie die Daten des neuen Kontakts ein"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ist OpenPGP für diesen Kontakt aktiviert?"
 
-#: ../src/common/config.py:417
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
-msgstr "Soll automatisch eine ESession-Verschlüsselung mit diesem Kontakt gestartet werden?"
+#: ../src/common/config.py:432
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+"Soll automatisch eine ESession-Verschlüsselung mit diesem Kontakt gestartet "
+"werden?"
 
-#: ../src/common/config.py:418
-#: ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Sprache, die für die Rechtschreibprüfung verwerdet werden soll"
 
 # TODO: Review by german translators: getrennte Status || getrennter Status
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "alle oder durch Leerzeichen getrennte Status"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'ja', 'nein' oder 'beide'"
 
-#: ../src/common/config.py:429
-#: ../src/common/config.py:431
-#: ../src/common/config.py:432
-#: ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'ja, 'nein' oder ''"
 
-#: ../src/common/config.py:442
-#: ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:444
-#: ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, bitte hinterlasse eine Nachricht."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:446
-#: ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbeiten"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Ich bin draußen und genieße das Leben."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Ich bin angemeldet."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Ich bin frei zum Chatten."
 
-#: ../src/common/config.py:461
-#: ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Bin gleich zurück."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Ich bin nicht verfügbar."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Bitte nicht stören."
 
-#: ../src/common/config.py:464
-#: ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Auf Wiedersehen!"
 
-#: ../src/common/config.py:475
-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 "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: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."
+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:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ton, der bei einer neuen Chatraum-Nachricht abgespielt werden soll"
 
-#: ../src/common/config.py:485
-#: ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:489
-#: ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "Lebensmittel"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "Menschlich"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../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:251
-msgid "Wrong host"
-msgstr "Falscher Server"
-
-# TODO: Review by german translators. Get closer to original string and write instead: Ungültige lokale Adresse? :-O
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Ungültige Lokale Adresse!"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
-msgstr "Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig angekommen"
+msgstr ""
+"Die Registrierungsinformation für den Transport %s sind nicht rechtzeitig "
+"angekommen"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registrierung war erfolgreich"
 
 # FIXME: Type in original string. Should be
 # Registration with agent %s succeeded
 # FIXME: Check English: should be consistently called "transport"
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrierung mit Agent %s war erfolgreich"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 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:706
-#, python-format
-msgid "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
-msgstr "Registrierung mit Agent %(agent)s ist mit Fehler %(error)s fehlgeschlagen: %(error_msg)s"
-
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481
-#: ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../src/common/connection_handlers.py:133
+#, python-format
+msgid ""
+"Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
+msgstr ""
+"Registrierung mit Agent %(agent)s ist mit Fehler %(error)s fehlgeschlagen: %"
+"(error_msg)s"
+
+#: ../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
 msgid "Disk Write Error"
 msgstr "Fehler beim Schreiben auf Festplatte"
 
-#: ../src/common/connection_handlers.py:1225
-#: ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Unsichtbarkeit wird nicht unterstützt"
 
-#: ../src/common/connection_handlers.py:1226
-#: ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Das Konto %s unterstützt keine Unsichtbarkeit."
 
-#: ../src/common/connection_handlers.py:1919
-#: ../src/common/connection.py:233
-#: ../src/config.py:1940
-#: ../src/config.py:1949
-#: ../src/config.py:2008
-#: ../src/config.py:3360
-#: ../src/dataforms_widget.py:577
-#: ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 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."
+msgstr ""
+"Es wurde eine Nachricht von einer ungültigen Jabber-ID empfangen. Die "
+"Nachricht wurde ignoriert."
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484
-#: ../src/common/connection.py:421
-#: ../src/gajim.py:155
-#: ../src/session.py:135
+#: ../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)."
-msgstr "Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu reparieren (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu löschen (dabei gehen alle Verläufe verloren)."
+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 ""
+"Die Datenbankdatei (%s) konnte nicht gelesen werden. Versuchen Sie, diese zu "
+"reparieren (http://trac.gajim.org/wiki/DatabaseBackup (Englisch)) oder zu "
+"löschen (dabei gehen alle Verläufe verloren)."
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Spitzname nicht erlaubt: %s"
@@ -4015,80 +4358,85 @@ msgstr "Spitzname nicht erlaubt: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310
-#: ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Fehler beim Betreten des Chatraums"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Die maximale Anzahl an Benutzern für %s wurde erreicht"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Sie wurden aus dem Chatraum %s verbannt."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Der Chatraum %s existiert nicht."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Die Chatraumerstellung ist eingeschränkt."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
-msgstr "Sie müssen Ihren registrierten Spitznamen in diesem Chatraum %s verwenden."
+msgstr ""
+"Sie müssen Ihren registrierten Spitznamen in diesem Chatraum %s verwenden."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Sie stehen nicht in der Mitgliedliste des Chatraums %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Der Chatraum wurde gelöscht"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Sie können stattdessen diesen Chatraum betreten: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Ich würde Sie gerne als Kontakt zu meiner Kontaktliste hinzufügen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Sie haben jetzt %s abonniert"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Beendigung des Abonnements von %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
-msgid "JID %s is not RFC compliant. It will not be added to your roster. Use roster management tools such as http://jru.jabberstudio.org/ to remove it"
-msgstr "Die Jabber-ID %s ist nicht RFC-konform und wird nicht zu Ihrer Kontaktliste hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool wie <http://jru.jabberstudio.org/>, um sie zu entfernen."
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Die Jabber-ID %s ist nicht RFC-konform und wird nicht zu Ihrer Kontaktliste "
+"hinzugefügt. Verwenden Sie ein Kontaktlisten-Managment-Tool wie <http://jru."
+"jabberstudio.org/>, um sie zu entfernen."
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4213,34 +4561,40 @@ msgstr "Zertifizierungsstelle und Aussteller-Seriennummer unpassend"
 
 #: ../src/common/connection.py:98
 msgid "Key usage does not include certificate signing"
-msgstr "Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des Zertifikats."
+msgstr ""
+"Die Verwendung des Schlüssels beinhaltet nicht das Unterschreiben des "
+"Zertifikats."
 
 #: ../src/common/connection.py:99
 msgid "Application verification failure"
 msgstr "Fehler beim Überprüfen der Anwendung"
 
-#: ../src/common/connection.py:234
-#: ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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."
+msgstr ""
+"Die Nachricht kann nicht an %s gesendet werden. Die Jabber-ID ist ungültig."
 
-#: ../src/common/connection.py:256
+#: ../src/common/connection.py:271
 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."
+msgstr ""
+"Weder ist die entfernte Präsenz signiert, noch wurde ein Schlüssel "
+"zugewiesen."
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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."
+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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Diese Nachricht ist *verschlüsselt* (Siehe: JEP:`27`)]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4249,80 +4603,83 @@ msgstr ""
 "Thema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Manuelle Neuverbindung."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "Der Server %(name)s beantwortete die Registrierungsanfrage nicht korrekt: %(error)s"
+msgstr ""
+"Der Server %(name)s beantwortete die Registrierungsanfrage nicht korrekt: %"
+"(error)s"
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Der Server %s hat ein anderes Registrierungsformular angeboten"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unbekannter SSL-Fehler: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Ungültige Antwort"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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"
+msgstr ""
+"Der Transport %(name)s beantwortete die Registrierungsanfrage nicht korrekt: "
+"%(error)s"
 
-#: ../src/common/connection.py:1075
-#: ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Die Verbindung mit %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1076
-#: ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
-msgstr "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
+msgstr ""
+"Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server antwortete: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Verbindung mit Proxy fehlgeschlagen"
 
-#: ../src/common/connection.py:1125
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Die Verbindung zum Konto %s konnte nicht hergestellt werden."
 
-#: ../src/common/connection.py:1126
-#: ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
-msgstr "Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird wiederhergestellt."
+msgstr ""
+"Die Verbindung zum Konto \"%s\" wurde unterbrochen. Sie wird "
+"wiederhergestellt."
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, 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:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4331,7 +4688,7 @@ msgstr ""
 "\n"
 "SSL-Fehler: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4340,73 +4697,70 @@ msgstr ""
 "\n"
 "Unbekannter SSL-Fehler: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 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:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Fehler beim Entfernen der Privatsphären-Liste"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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 "Die Privatsphären-Liste %s wurde nicht entfernt. Möglicherweise ist sie noch in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie es erneut."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+msgstr ""
+"Die Privatsphären-Liste %s wurde nicht entfernt. Möglicherweise ist sie noch "
+"in einer Ihrer Verbindungen aktiv. Deaktivieren Sie diese und versuchen Sie "
+"es erneut."
 
-#: ../src/common/connection.py:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Kontakt gesendet: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Gesendete Kontakte:"
 
-#: ../src/common/connection.py:1703
-#: ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Nicht abgeholt, da der Status auf Unsichtbar gesetzt ist"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "De-Registrierung fehlgeschlagen"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, 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:129
-#: ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Beobachter"
 
-#: ../src/common/contacts.py:133
-#: ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55
-#: ../src/disco.py:119
-#: ../src/disco.py:120
-#: ../src/disco.py:1464
-#: ../src/gui_interface.py:413
-#: ../src/roster_window.py:848
-#: ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572
-#: ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transporte"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Nicht in der Kontaktliste"
 
@@ -4415,36 +4769,54 @@ msgstr "Nicht in der Kontaktliste"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus läuft nicht korrekt auf diesem Rechner"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (auch python-pysqlite2 genannt) fehlt. Abbruch …"
+#: ../src/common/dbus_support.py:54
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: system bus not present"
+msgstr "D-Bus läuft nicht korrekt auf diesem Rechner"
+
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "D-Bus läuft nicht korrekt auf diesem Rechner"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Die Datenbank kann nicht gelesen werden."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist deaktiviert."
+msgstr ""
+"Dienst nicht verfügbar: Gajim ist nicht aktiv oder remote_control ist "
+"deaktiviert."
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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."
+msgstr ""
+"D-Bus ist auf diesem Computer nicht vorhanden oder das Python-Modul fehlt."
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Sitzungsbus ist nicht verfügbar.\n"
+"Bitte lesen Sie http://trac.gajim.org/wiki/GajimDBus (Englisch)"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Sitzungsbus ist nicht verfügbar.\n"
 "Bitte lesen Sie http://trac.gajim.org/wiki/GajimDBus (Englisch)"
@@ -4564,8 +4936,7 @@ msgstr "fünf vor %(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 "Nachts"
 
@@ -4601,8 +4972,7 @@ msgstr "Spät Abends"
 msgid "Start of week"
 msgstr "Anfang der Woche"
 
-#: ../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 "Mitte der Woche"
 
@@ -4614,244 +4984,277 @@ msgstr "Ende der Woche"
 msgid "Weekend!"
 msgstr "Wochenende!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Ungültiges Zeichen im Benutzernamen"
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Server-Adresse benötigt."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Ungültiges Zeichen im Rechnernamen."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Ungültiges Zeichen in der Ressource."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Beschäftigt"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Beschäftigt"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Nicht verfügbar"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Frei zum Chatten"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Frei zum Chatten"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Angemeldet"
 
-#: ../src/common/helpers.py:212
-#: ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Verfügbar"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "Ab_wesend"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "A_bgemeldet"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Abgemeldet"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Unsichtbar"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?Kontakt hat Status: Unbekannt"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?Kontakt hat Status: Hat einen Fehler"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Abonnement schon vorhanden:Keines"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "An"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Frage nach Abonnement: Keine"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Abonnieren"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppenchat Kontaktrolle: Keine"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderatoren"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Teilnehmer"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Besucher"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppenchat Kontaktverbindung:Keine"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Besitzer"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Mitglied"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "beobachtet diese Unterhaltung"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "tut etwas anderes"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "macht gerade eine Schreibpause"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "hat das Chatfenster oder den Tab geschlossen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s kB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049
-#: ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr "Vom Chatraum %s"
 
-#: ../src/common/helpers.py:1065
-#: ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " vom Benutzer %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr "Von %s"
 
-#: ../src/common/helpers.py:1074
-#: ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, 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:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Chatraum-Einstellungen"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
@@ -4861,18 +5264,75 @@ msgstr "Fehler beim Ausführen von \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s ist kein gültiger Loglevel."
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Standard-Nachricht"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+#, fuzzy
+msgid "Audio test"
+msgstr "Audio / Video"
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Größe: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
-#: ../src/common/optparser.py:297
-#: ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migriere Logdatenbank zu Indizes"
 
@@ -5293,8 +5753,7 @@ msgstr "Mittagessen"
 msgid "Exercising"
 msgstr "Sport machen"
 
-#: ../src/common/pep.py:133
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Rad fahren"
 
@@ -5510,19 +5969,19 @@ msgstr "Lernen"
 msgid "Writing"
 msgstr "Schreiben"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Unbekannter Künstler"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Unbekannter Titel"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Unbekannte Quelle"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5532,19 +5991,25 @@ msgstr ""
 "aus <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
-msgid "Maybe you have another running instance of Gajim. File Transfer will be cancelled."
+#: ../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:301
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[Dies ist ein Teil einer verschlüsselten Unterhaltung. Wenn Sie diese Nachricht sehen, ist etwas schief gegangen.]"
+#: ../src/common/stanza_session.py:303
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[Dies ist ein Teil einer verschlüsselten Unterhaltung. Wenn Sie diese "
+"Nachricht sehen, ist etwas schief gegangen.]"
 
 #: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
@@ -5597,8 +6062,11 @@ 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:359
-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."
+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:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
@@ -5606,254 +6074,248 @@ msgstr "Die Verbindung zum Server konnte nicht hergestellt werden: Zeitüberschr
 msgid "Error while adding service. %s"
 msgstr "Fehler beim Hinzufügen des Dienstes. %s"
 
-#: ../src/config.py:157
-#: ../src/config.py:586
-msgid "Disabled"
-msgstr "Deaktiviert"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Standard-Nachricht"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Aktiviert"
 
-#: ../src/config.py:654
-#: ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Kein Wörterburch für die Sprache %s verfügbar"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, um die Rechtschreibprüfung nutzen zu können."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "Statusnachricht"
 
 #. Name column
-#: ../src/config.py:1394
-#: ../src/dialogs.py:2232
-#: ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014
-#: ../src/disco.py:831
-#: ../src/disco.py:1690
-#: ../src/disco.py:1992
-#: ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Jetzt erneut anmelden?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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."
+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:1620
-#: ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden."
 
-#: ../src/config.py:1785
-#: ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Ungelesene Ereignisse"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Alle ungelesenen Ereignisse anzeigen, bevor das Konto entfernt wird."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Sie haben mit dem Konto %s einen Chat geöffnet."
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alle Chatfenster werden geschlossen. Fortfahren?"
 
-#: ../src/config.py:1825
-#: ../src/config.py:2348
-#: ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden."
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
-msgstr "Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
+msgstr ""
+"Die Verbindung muss beendet werden, damit der Kontoname geändert werden kann."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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."
+msgstr ""
+"Damit der Kontoname geändert werden kann, müssen Sie zuvor alle neuen "
+"Ereignisse lesen."
 
-#: ../src/config.py:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Der Kontoname wird bereits verwendet."
 
-#: ../src/config.py:1837
-msgid "This name is already used by another of your accounts. Please choose another name."
-msgstr "Dieser Name wird bereits für eines Ihrer Konten verwendet. Bitte wählen Sie einen anderen Namen."
+#: ../src/config.py:1942
+msgid ""
+"This name is already used by another of your accounts. Please choose another "
+"name."
+msgstr ""
+"Dieser Name wird bereits für eines Ihrer Konten verwendet. Bitte wählen Sie "
+"einen anderen Namen."
 
-#: ../src/config.py:1841
-#: ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Der Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Der Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Konto umbenennen"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, 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:1950
+#: ../src/config.py:2055
 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:2158
-#: ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:2159
-#: ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Der Proxy-Port muss eine gültige Portnummer sein."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 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:2181
+#: ../src/config.py:2286
 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:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP-Schlüssel-Auswahl"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie Ihren OpenPGP-Schlüssel"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Das angegebene Konto ist nicht verfügbar"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231
-#: ../src/dialogs.py:2031
-#: ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405
-#: ../src/disco.py:477
-#: ../src/profile_window.py:325
+msgstr ""
+"Sie müssen ein Konto erstellen, bevor Sie die persönlichen Informationen "
+"ändern können."
+
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden."
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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."
+msgstr ""
+"Sie müssen angemeldet sein, um Ihre persönlichen Informationen ändern zu "
+"können."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Ihr Server unterstützt keine vCard."
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Ihr Server kann keine persönlichen Informationen speichern."
 
-#: ../src/config.py:2349
-#: ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "Zum Deaktivieren des Kontos, müssen Sie offline sein."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Ein Konto mit dem Namen 'Local' ist bereits vorhanden."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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."
+msgstr ""
+"Bitte benennen Sie es um oder entfernen es, bevor Sie LAN-Kontakte "
+"aktivieren."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "%s bearbeiten"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Sperrliste"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Mitgliederliste"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Besitzerliste"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Administratorliste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600
-#: ../src/disco.py:838
-#: ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "Jabber-ID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Grund"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Verbannen …"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5861,11 +6323,11 @@ msgstr ""
 "<b>Wen möchten Sie verbannen?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Mitglied hinzufügen …"
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5873,11 +6335,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Mitglied machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Besitzer hinzufügen …"
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5885,11 +6347,11 @@ msgstr ""
 "<b>Wen möchten Sie zum Besitzer machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Administrator hinzufügen …"
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5897,7 +6359,7 @@ msgstr ""
 "<b>Wen möchten Sie zum Administrator machen?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5910,126 +6372,157 @@ msgstr ""
 "1. benutzer@domain/resource (nur die angegebene Ressource trifft zu).\n"
 "2. benutzer@domain (jede Ressource trifft zu).\n"
 "3. servername/resource (nur die angegebene Ressource trifft zu)\n"
-"4. servername (sowohl die Domain selbst trifft zu als auch jeder benutzer@domain, jede domain/Ressource oder jede Adresse, die eine Subdomain enthält)."
+"4. servername (sowohl die Domain selbst trifft zu als auch jeder "
+"benutzer@domain, jede domain/Ressource oder jede Adresse, die eine Subdomain "
+"enthält)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2785
-#: ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Emoticons deaktiviert"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2786
-#: ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Bitte geben Sie Ihr Passwort für %s ein"
 
-#: ../src/config.py:2787
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Das Konto \"%s\" ist mit dem Server verbunden"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Verbindung mit Proxy fehlgeschlagen"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Was möchten Sie tun?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Kont_o entfernen (nur in Gajim)"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Nur betreten und verlassen"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Nichts"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Neuer Gruppenchat"
 
 # TODO: make decisision about how to handle original string referring to a bookmarked groupchat.
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Dieser gespeicherte Chatraum beinhaltet ungültige Daten"
 
-#: ../src/config.py:3001
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
-msgstr "Bitte Server- und Chatraumfeld ausfüllen oder gespeicherten Chatraum löschen."
+#: ../src/config.py:3129
+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:3119
-#: ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3120
-#: ../src/config.py:3134
-#: ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Zeichen nicht erlaubt"
 
-#: ../src/config.py:3133
-#: ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Ungültiger Server"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Ungültiger Raum"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Konto wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:3300
-#: ../src/config.py:3306
-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 "Sie können erweiterte Kontooptionen festlegen, indem Sie den Erweitert Button drücken, oder später den Eintrag Konto im Ändern Menü in der Kontaktliste auswählen."
+#: ../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."
+msgstr ""
+"Sie können erweiterte Kontooptionen festlegen, indem Sie den Erweitert "
+"Button drücken, oder später den Eintrag Konto im Ändern Menü in der "
+"Kontaktliste auswählen."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
-msgstr "Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
+msgstr ""
+"Sie müssen einen Benutzernamen angeben, um dieses Konto zu konfigurieren."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 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:3439
-#: ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Zertifikat bereits in der Datei"
 
-#: ../src/config.py:3440
-#: ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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."
+msgstr ""
+"Dieses Zertifikat wird nicht erneut hinzugefügt, da es sich bereit in der "
+"Datei %s befindet."
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6044,8 +6537,7 @@ msgstr ""
 "SSL-Fehler: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/config.py:3516
-#: ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6056,60 +6548,59 @@ msgstr ""
 "SHA1-Fingerprint dieses Zertifikates:\n"
 "%s"
 
-#: ../src/config.py:3543
-#: ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Der Kontoname ist bereits vergeben"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Erste empfangene Nachricht"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Nächste empfangene Nachricht ausgewählt"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Nächste empfangene Nachricht nicht ausgewählt"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt verbunden"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt nicht verbunden"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Nachricht gesendet"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Hervorhebung von Chatraum-Nachrichten"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Chatraum-Nachricht empfangen"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "E-Mail über Google-Mail empfangen"
 
@@ -6127,46 +6618,48 @@ msgstr ""
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
-msgstr "Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in diesem Chatraum gesagt wurde."
+msgstr ""
+"Der Text unterhalb dieser Linie zeigt, was seit Ihrem letzten Besuch in "
+"diesem Chatraum gesagt wurde."
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Zitieren"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, 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:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Im _Internet hiernach suchen"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Als _Link öffnen"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6174,8 +6667,7 @@ msgstr[0] "Gestern"
 msgstr[1] "vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330
-#: ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
@@ -6186,15 +6678,16 @@ msgstr "Die Jabber-ID steht bereits in der Liste"
 
 #: ../src/dataforms_widget.py:582
 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."
+msgstr ""
+"Die eingegebene Jabber-ID ist bereits in der Liste. Wählen Sie bitte eine "
+"andere."
 
 #. Default jid
 #: ../src/dataforms_widget.py:593
 msgid "new@jabber.id"
 msgstr "neu@jabber.id"
 
-#: ../src/dataforms_widget.py:596
-#: ../src/dataforms_widget.py:598
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "neu%d@jabber.id"
@@ -6243,8 +6736,11 @@ msgid "Overwrite Status Message?"
 msgstr "Statusnachricht überschreiben"
 
 #: ../src/dialogs.py:794
-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?"
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
+msgstr ""
+"Dieser Name wird bereits verwendet. Möchten Sie die Statusnachricht "
+"überschreiben?"
 
 #: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
@@ -6277,70 +6773,70 @@ msgstr "Yahoo-Adresse"
 #: ../src/dialogs.py:872
 #, 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"
+msgstr ""
+"Bitte füllen Sie die Daten für den Kontakt aus, den Sie dem Konto %s "
+"hinzufügen wollen"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 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:1035
-#: ../src/dialogs.py:1041
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Die Benutzer-ID darf keine Ressource enthalten."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Sie können sich nicht selbst zu Ihrer Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakt bereits in der Kontaktliste"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Der angegebene Kontakt befindet sich bereits in Ihrer Kontaktliste."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "_Benutzer-ID:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Ein Jabber-Client in GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+-Version:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK-Version"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Derzeitige Entwickler:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Frühere Entwickler:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "DANKE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Fridtjof Busse\n"
@@ -6350,113 +6846,114 @@ msgstr ""
 "Nico Gulden (cilugnedon AT gmx.de)\n"
 "Niklas Hambüchen (nh2 AT deditus.de)"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, 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 ""
-"Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, um die Rechtschreibprüfung nutzen zu können.\n"
+"Sie müssen das Wörterbuch %s installieren oder eine andere Sprache wählen, "
+"um die Rechtschreibprüfung nutzen zu können.\n"
 "\n"
 "Falsch geschriebene Wörter können nicht hervorgehoben werden."
 
-#: ../src/dialogs.py:1830
-#: ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Die Jabber-ID enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anfrage von %s"
 
-#: ../src/dialogs.py:2026
-#: ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Sie sind bereits im Chatraum %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Chatraum betreten mit dem Konto %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Ungültiges Konto"
 
-#: ../src/dialogs.py:2161
-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:2301
+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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:2175
-#: ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Ungültige Jabber-ID für den Chatraum"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 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:2182
-#: ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Die Jabber-ID des Chatraums enthält ungültige Zeichen."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Dies ist kein Chatraum"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ist nicht der Name eines Chatraums."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 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:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Das Konto \"%s\" ist nicht mit dem Server verbunden"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 msgid "You cannot synchronize with an account unless it is connected."
-msgstr "Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
+msgstr ""
+"Sie können ein Konto nicht synchronisieren, solange es nicht verbunden ist."
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Synchronisieren"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Konto %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6465,352 +6962,326 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384
-#: ../src/dialogs.py:2767
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:2385
-#: ../src/dialogs.py:2768
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:2394
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Ungültige Jabber-ID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kann \"%s\" nicht parsen."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 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:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Die Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469
-#: ../src/notify.py:263
-#: ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:2471
-#: ../src/notify.py:271
-#: ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt hat sich abgemeldet"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473
-#: ../src/notify.py:294
-#: ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:2473
-#: ../src/notify.py:275
-#: ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
 #. private message
-#: ../src/dialogs.py:2474
-#: ../src/notify.py:282
-#: ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:2474
-#: ../src/gui_interface.py:1315
-#: ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Neue E-Mail"
 
-#: ../src/dialogs.py:2476
-#: ../src/gui_interface.py:1382
-#: ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Anfrage zur Dateiübertragung"
 
-#: ../src/dialogs.py:2478
-#: ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349
-#: ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Dateiübertragungsfehler"
 
-#: ../src/dialogs.py:2480
-#: ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449
-#: ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Dateiübertragung beendet"
 
-#: ../src/dialogs.py:2481
-#: ../src/gui_interface.py:1430
-#: ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Dateiübertragung gestoppt"
 
-#: ../src/dialogs.py:2483
-#: ../src/gui_interface.py:1123
-#: ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Gruppenchat-Einladung"
 
-#: ../src/dialogs.py:2485
-#: ../src/notify.py:255
-#: ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakt hat Status verändert"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Einzelne Nachricht über das Konto %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "%s empfangen"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-Konsole für %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML-Konsole"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 msgid "add"
 msgstr "hinzufügen"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 msgid "modify"
 msgstr "Verändern"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 msgid "remove"
 msgstr "Entfernen"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, 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> möchte gerne einige Kontakte in deiner Kontaktliste <b>%(action)s</b>."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+msgstr ""
+"<b>%(jid)s</b> möchte gerne einige Kontakte in deiner Kontaktliste <b>%"
+"(action)s</b>."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003
-#: ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Hinzufügen"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005
-#: ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Verändern"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Löschen"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Gruppen"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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."
+msgstr ""
+"%s hat mir vorgeschlagen Sie als Kontakt zu meiner Kontaktliste hinzuzufügen."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, python-format
 msgid "Added  %s contacts"
 msgstr "%s Kontakte hinzugefügt"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "%s Kontakte entfernt"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privatsphären-Liste <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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"
+msgstr ""
+"Sortierung: %(order)s, Aktion: %(action)s, Typ: %(type)s, Wert: %(value)s"
 
-#: ../src/dialogs.py:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Sortierung: %(order)s, Aktion: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Eine Regel bearbeiten</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Eine Regel hinzufügen</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privatsphären-Liste für %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Privatsphären-Listen"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Ungültiger Listenname"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 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."
+msgstr ""
+"Sie müssen einen Namen eingeben, um eine Privatsphären-Liste erstellen zu "
+"können."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Sie wurden in einen Chatraum eingeladen"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact hat Sie in den Chatraum %(room_Jabber-ID)s eingeladen"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Möchten Sie die Einladung annehmen?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:3740
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav-Dateien"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "Nr."
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Bedingung"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "wenn Ich bin "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6819,215 +7290,249 @@ msgid ""
 msgstr ""
 "Ihre Unterhaltung mit <b>%(jid)s</b> ist verschlüsselt.\n"
 "\n"
-"Der kurze Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>%(sas)s</b>"
+"Der kurze Authentifizierungs-Schlüssel für diese Unterhaltung ist: <b>%(sas)"
+"s</b>"
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Sie haben die Identität dieses Kontaktes bereits überprüft."
 
-#: ../src/dialogs.py:4551
-#: ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Kontaktidentität wurde überprüft"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Erneut überprüfen …"
 
-#: ../src/dialogs.py:4564
-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 "Um sicher zu stellen, dass <b>nur</b> der beabsichtigte Empfänger Ihre 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: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."
+msgstr ""
+"Um sicher zu stellen, dass <b>nur</b> der beabsichtigte Empfänger Ihre "
+"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:4567
-#: ../src/dialogs.py:4621
-#: ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktidentität nicht überprüft"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Überprüfen …"
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Haben Sie die Identität des Kontaktes überprüft?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, 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 ""
-"Um zu verhindern, dass Sie mit einer anderen Person reden, sollten Sie <b>%(jid)s</b> kontaktieren (persönlich oder telefonisch), um den kurzen Authentifizierungs-Schlüssel beidseitig zu überprüfen.\n"
+"Um zu verhindern, dass Sie mit einer anderen Person reden, sollten Sie <b>%"
+"(jid)s</b> kontaktieren (persönlich oder telefonisch), um den kurzen "
+"Authentifizierungs-Schlüssel beidseitig zu überprüfen.\n"
 "\n"
-"Der kurze Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</b>"
+"Der kurze Authentifizierungs-Schlüssel dieser Unterhaltung ist: <b>%(sas)s</"
+"b>"
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 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?"
+msgstr ""
+"Haben Sie mit dem Kontakt gesprochen, um den kurzen Authentifizierungs-"
+"Schluessel zu überprüfen?"
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
-msgstr "Der Kontaktschlüssel (%s) <b>stimmt nicht</b> mit dem in Gajim zugewiesenen Schlüssel überein."
+msgstr ""
+"Der Kontaktschlüssel (%s) <b>stimmt nicht</b> mit dem in Gajim zugewiesenen "
+"Schlüssel überein."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr "Dem Kontakt ist kein GPG-Schlüssel zugewiesen. Nachrichten können nicht verschlüsselt werden."
+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:4635
-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 "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. Benutzen Sie den GPG-Client, um den Schlüssel als vertrauenswürdig einzustufen."
+#: ../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."
+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. "
+"Benutzen Sie den GPG-Client, um den Schlüssel als vertrauenswürdig "
+"einzustufen."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/dialogs.py:4641
-msgid "GPG 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:4828
+msgid ""
+"GPG 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:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr "eine Audio und Video"
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr "eine Audio"
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr "eine Video"
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
-msgid "%(contact)s wants to start %(type)s session with you. Do you want to answer the call?"
-msgstr "%(contact)s möchte eine %(type)s-Sitzung mit dir starten. Möchten Sie den Anruf annehmen?"
+msgid ""
+"%(contact)s wants to start %(type)s session with you. Do you want to answer "
+"the call?"
+msgstr ""
+"%(contact)s möchte eine %(type)s-Sitzung mit dir starten. Möchten Sie den "
+"Anruf annehmen?"
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Andere"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Konferenz"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 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:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Dienste des Kontos %s durchsuchen"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Dienste durchsuchen"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Der Dienst konnte nicht gefunden werden"
 
-#: ../src/disco.py:707
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Es existiert kein Dienst an der Adresse, die Sie angegeben haben, oder der Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es erneut."
+#: ../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."
+msgstr ""
+"Es existiert kein Dienst an der Adresse, die Sie angegeben haben, oder der "
+"Dienst antwortet nicht. Überprüfen Sie die Adresse und versuchen Sie es "
+"erneut."
 
-#: ../src/disco.py:711
-#: ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Der Dienst ist nicht durchsuchbar"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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."
+msgstr ""
+"Dieser Art von Dienst enthält keine Objekte, die durchsucht werden können."
 
-#: ../src/disco.py:751
-#: ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Ungültiger Servername"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Durchsuche %(address)s über das Konto %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Durchsuche"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Befehl ausführen"
 
-#: ../src/disco.py:1298
-#: ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Durchsuche %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Beschreibung"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1781
-#: ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "Chatraum zu den Lesezeichen _hinzufügen"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Chatraum ist bereits gespeichert"
 
-#: ../src/disco.py:1782
-#: ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Der Chatraum \"%s\" wurde bereits gespeichert."
 
-#: ../src/disco.py:1791
-#: ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Chatraum wurde erfolgreich gespeichert"
 
-#: ../src/disco.py:1792
-#: ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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"
+msgstr ""
+"Sie können die gespeicherten Chaträume über das Aktionen-Menü in der "
+"Kontaktliste bearbeiten"
 
-#: ../src/disco.py:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Neue Nachricht"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Abbestellen"
 
@@ -7036,11 +7541,13 @@ msgid "SSL certificat validation"
 msgstr "SSL/TLS-Zertifikatprüfung"
 
 #: ../src/features_window.py:49
-msgid "A library used to validate server certificates to ensure a secure connection."
-msgstr "Ermöglicht die Validierung von Server-Zertifikaten, die eine sichere Verbindung gewährleisten."
+msgid ""
+"A library used to validate server certificates to ensure a secure connection."
+msgstr ""
+"Ermöglicht die Validierung von Server-Zertifikaten, die eine sichere "
+"Verbindung gewährleisten."
 
-#: ../src/features_window.py:50
-#: ../src/features_window.py:51
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Erfordert python-pyopenssl."
 
@@ -7050,7 +7557,9 @@ msgstr "Bonjour / Zeroconf"
 
 #: ../src/features_window.py:53
 msgid "Serverless chatting with autodetected clients in a local network."
-msgstr "Ermöglicht serverloses Chatten mit automatischer Clienterkennung in lokalen Netzwerken."
+msgstr ""
+"Ermöglicht serverloses Chatten mit automatischer Clienterkennung in lokalen "
+"Netzwerken."
 
 #: ../src/features_window.py:54
 msgid "Requires python-avahi."
@@ -7058,7 +7567,8 @@ msgstr "Erfordert python-avahi."
 
 #: ../src/features_window.py:55
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
-msgstr "Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour (Englisch))."
+msgstr ""
+"Erfordert pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour (Englisch))."
 
 #: ../src/features_window.py:56
 msgid "Command line"
@@ -7072,14 +7582,10 @@ msgstr "Ermöglicht es, Gajim per Skript über die Konsole zu steuern."
 msgid "Requires python-dbus."
 msgstr "Erfordert python-dbus."
 
-#: ../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:111
+#: ../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
 msgid "Feature not available under Windows."
 msgstr "Funktion unter Windows nicht verfügbar."
 
@@ -7115,7 +7621,9 @@ msgstr "Sitzungsverwaltung"
 
 #: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
-msgstr "Die Gajim-Sitzung kann beim Logout gespeichert und beim Login wiederhergestellt werden."
+msgstr ""
+"Die Gajim-Sitzung kann beim Logout gespeichert und beim Login "
+"wiederhergestellt werden."
 
 #: ../src/features_window.py:70
 msgid "Requires python-gnome2."
@@ -7155,7 +7663,8 @@ msgstr "Rechtschreibprüfung"
 
 #: ../src/features_window.py:81
 msgid "Spellchecking of composed messages."
-msgstr "Ermöglicht das Überprüfen verfasster Nachrichten auf Rechtschreibfehler."
+msgstr ""
+"Ermöglicht das Überprüfen verfasster Nachrichten auf Rechtschreibfehler."
 
 #: ../src/features_window.py:82
 msgid "Requires libgtkspell."
@@ -7170,8 +7679,12 @@ msgid "Passive popups notifying for new events."
 msgstr "Ermöglicht passive Popups, die über neue Ereignisse informieren."
 
 #: ../src/features_window.py:86
-msgid "Requires python-notify or instead python-dbus in conjunction with notification-daemon."
-msgstr "Erfordert python-notify oder stattdessen python-dbus in Verbindung mit notification-daemon."
+msgid ""
+"Requires python-notify or instead python-dbus in conjunction with "
+"notification-daemon."
+msgstr ""
+"Erfordert python-notify oder stattdessen python-dbus in Verbindung mit "
+"notification-daemon."
 
 #: ../src/features_window.py:88
 msgid "Automatic status"
@@ -7179,7 +7692,9 @@ msgstr "Automatischer Status"
 
 #: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Emöglicht die Messung der Zeit, während der der Computer nicht benutzt wird, um den Status automatisch zu setzen."
+msgstr ""
+"Emöglicht die Messung der Zeit, während der der Computer nicht benutzt wird, "
+"um den Status automatisch zu setzen."
 
 #: ../src/features_window.py:90
 msgid "Requires libxss library."
@@ -7195,15 +7710,25 @@ msgstr "LaTeX"
 
 #: ../src/features_window.py:93
 msgid "Transform LaTeX expressions between $$ $$."
-msgstr "Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird als LaTeX interpretiert."
+msgstr ""
+"Ermöglicht die Verwendung von LaTeX-Ausdrücken. Text zwischen $$ $$ wird als "
+"LaTeX interpretiert."
 
 #: ../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 "Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Im erweiterten Konfigurationseditor muss 'use_latex' auf 'true' gesetzt werden."
+msgid ""
+"Requires texlive-latex-base and dvipng. 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: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 "Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Sie müssen 'use_latex' im Erweiterten Konfigurationseditor auf 'true' setzen."
+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 ""
+"Erfordert texlive-latex-base und dvipng (befindlich in MikTeX). Sie müssen "
+"'use_latex' im Erweiterten Konfigurationseditor auf 'true' setzen."
 
 #: ../src/features_window.py:96
 msgid "End to End message encryption"
@@ -7213,8 +7738,7 @@ msgstr "ESession-Verschlüsselung"
 msgid "Encrypting chat messages."
 msgstr "Nachrichten können per ESession verschlüsselt werden."
 
-#: ../src/features_window.py:98
-#: ../src/features_window.py:99
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Erfordert python-crypto"
 
@@ -7223,116 +7747,100 @@ msgid "RST Generator"
 msgstr "RST-Generator"
 
 #: ../src/features_window.py:101
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "Kann aus RST-Code XHTML-Ausgaben erzeugen (siehe http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html (Englisch))."
+msgid ""
+"Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
+"docs/ref/rst/restructuredtext.html)."
+msgstr ""
+"Kann aus RST-Code XHTML-Ausgaben erzeugen (siehe http://docutils.sourceforge."
+"net/docs/ref/rst/restructuredtext.html (Englisch))."
 
-#: ../src/features_window.py:102
-#: ../src/features_window.py:103
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Erfordert python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Anklickbare Links"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr "Anklickbare URLs im Chatfenster."
-
-#: ../src/features_window.py:106
-#: ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Erfordert python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr "Audio / Video"
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr "Audio und Video Chat sind möglich."
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr "Erfordert python-farsight."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Feature"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Datei"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Zeit"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../src/filetransfers_window.py:177
-#: ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:178
-#: ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187
-#: ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Sie"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:189
-#: ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Absender: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Dateiübertragung abgeschlossen"
 
-#: ../src/filetransfers_window.py:217
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "Öffne _Ordner"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Dateiübertragung abgebrochen"
 
-#: ../src/filetransfers_window.py:217
-#: ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Empfänger: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Fehlermeldung: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Dateiübertragung gestoppt"
 
@@ -7340,8 +7848,7 @@ msgstr "Dateiübertragung gestoppt"
 msgid "Choose File to Send..."
 msgstr "Datei auswählen …"
 
-#: ../src/filetransfers_window.py:273
-#: ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Beschreibung: "
 
@@ -7373,39 +7880,39 @@ msgstr "Beschreibung: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s möchte Ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:342
-#: ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kann existierende Datei \"%s\" nicht überschreiben"
 
-#: ../src/filetransfers_window.py:343
-#: ../src/gtkgui_helpers.py:860
-msgid "A file with this name already exists and you do not have permission to overwrite it."
-msgstr "Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die erforderlichen Rechte, um sie zu überschreiben."
+#: ../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 ""
+"Eine Datei mit diesem Namen existiert bereits und Sie haben nicht die "
+"erforderlichen Rechte, um sie zu überschreiben."
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "What do you want to do?"
 msgstr "Was möchten Sie tun?"
 
 #. read-only bit is used to mark special folder under windows,
 #. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:369
-#: ../src/gtkgui_helpers.py:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Verzeichnis \"%s\" ist nicht schreibbar"
 
-#: ../src/filetransfers_window.py:369
-#: ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
-msgstr "Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien anzulegen."
+msgstr ""
+"Ihre Benutzerrechte erlauben es Ihnen nicht, in diesem Verzeichnis Dateien "
+"anzulegen."
 
 #: ../src/filetransfers_window.py:379
 msgid "Save File as..."
@@ -7427,8 +7934,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:585
-#: ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
@@ -7440,77 +7946,70 @@ msgstr "Datei: "
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:613
-#: ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:615
-#: ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Fortsetzen"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim benötigt einen laufenden X-Server. Abbruch …"
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "Import von PyGTIK fehlgeschlagen: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim benötigt PyGTK 2.12 oder höher"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim benötigt PyGTK 2.12 oder höher. Abbruch …"
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim benötigt GTK 2.12 oder höher"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim benötigt GTK 2.12 oder höher. Abbruch …"
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Der GTK+-Laufzeitumgebung fehlt die libglade-Unterstützung"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Bitte entfernen Sie Ihre derzeitige GTK+-Laufzeitumgebung und installieren Sie die aktuelle Version von %s"
-
-#: ../src/gajim.py:193
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Bitte stellen Sie sicher, dass die auf Ihrem Computer verwendeten Versionen von GTK+ und PyGTK libglade-Unterstützung besitzen."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim benötigt PySQLite2 zum Starten"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim benötigt pywin32 zum Laufen"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
-msgid "Please make sure that Pywin32 is installed on your system. You can get it at %s"
-msgstr "Bitte stellen Sie sicher das Pywin32 auf Ihrem Computer installiert ist. Sie können es unter folgender URL herunterladen: %s"
+msgid ""
+"Please make sure that Pywin32 is installed on your system. You can get it at "
+"%s"
+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:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim läuft bereits"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7540,24 +8039,20 @@ 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
-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:271
-#: ../src/gajim-remote.py:282
+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"
 msgstr "Konto"
 
@@ -7579,15 +8074,15 @@ msgid "status"
 msgstr "Status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "Mögliche Werte: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
-#: ../src/gajim-remote.py:273
+#: ../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"
 
@@ -7596,8 +8091,13 @@ msgid "status message"
 msgstr "Statusnachricht"
 
 #: ../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 "Ändere Status des Kontos \"account\". Falls nicht angegeben, ändere Status aller Konten für die die Option \"Kontostatus mit globalem Status synchronisieren\" aktiviert ist"
+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 ""
+"Ändere Status des Kontos \"account\". Falls nicht angegeben, ändere Status "
+"aller Konten für die die Option \"Kontostatus mit globalem Status "
+"synchronisieren\" aktiviert ist"
 
 #: ../src/gajim-remote.py:117
 msgid "Changes the priority of account or accounts"
@@ -7612,19 +8112,25 @@ msgid "priority you want to give to the account"
 msgstr "Priorität, die Sie dem Konto geben möchten"
 
 #: ../src/gajim-remote.py:121
-msgid "change the priority of the given account. If not specified, change status of all accounts that have \"sync with global status\" option set"
-msgstr "Priorität für das Konto ändern. Falls nicht angegeben, ändere den Status aller Konten für die die Option \"Kontostatus mit globalem Status synchronisieren\" aktiviert ist"
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"Priorität für das Konto ändern. Falls nicht angegeben, ändere den Status "
+"aller Konten für die die Option \"Kontostatus mit globalem Status "
+"synchronisieren\" aktiviert ist"
 
 #: ../src/gajim-remote.py:127
 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"
+msgstr ""
+"Zeige Chatfenster, sodass eine Nachricht an einen Kontakt gesendet werden "
+"kann"
 
 #: ../src/gajim-remote.py:129
 msgid "JID of the contact that you want to chat with"
 msgstr "Jabber-ID des Kontakts, mit dem Sie chatten möchten"
 
-#: ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "falls angegeben, wird der Kontakt von der Liste dieses Kontos gewählt"
 
@@ -7633,40 +8139,47 @@ msgid "message content. The account must be specified or \"\""
 msgstr "Nachrichteninhalt. Das Konto muss angegeben werden oder \"\""
 
 #: ../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 "Sendet eine Nachricht an einen Kontakt in der Kontaktliste. OpenPGP-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 ''."
+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 ""
+"Sendet eine Nachricht an einen Kontakt in der Kontaktliste. OpenPGP-"
+"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:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "Jabber-ID des Kontakts, der die Nachricht empfangen soll"
 
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
 #: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "Nachrichteninhalt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "PGP-Schlüssel"
 
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
 msgstr "falls angegeben, wird die Nachricht damit verschlüsselt"
 
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 #: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 
 #: ../src/gajim-remote.py:152
-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 "Sendet eine Nachricht an einen Kontakt in der Kontaktliste. OpenPGP-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 ''."
+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 ""
+"Sendet eine Nachricht an einen Kontakt in der Kontaktliste. OpenPGP-"
+"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
 msgid "subject"
@@ -7688,10 +8201,8 @@ msgstr "Jabber-ID des Chatraums, der die Nachricht empfangen soll"
 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:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "Jabber-ID des Kontakts"
 
@@ -7733,7 +8244,9 @@ msgstr "Schlüssel=Wert"
 
 #: ../src/gajim-remote.py:202
 msgid "'key' is the name of the preference, 'value' is the value to set it to"
-msgstr "'Schlüssel' ist der Name der Einstellung, 'Wert' ist der der einzustellende Wert"
+msgstr ""
+"'Schlüssel' ist der Name der Einstellung, 'Wert' ist der der einzustellende "
+"Wert"
 
 #: ../src/gajim-remote.py:207
 msgid "Deletes a preference item"
@@ -7769,11 +8282,16 @@ msgstr "Fügt einen neuen Kontakt zu diesem Konto hinzu"
 
 #: ../src/gajim-remote.py:235
 msgid "Returns current status (the global one unless account is specified)"
-msgstr "Gibt den derzeitigen Status zurück (den globalen Status, es sei denn, es wird ein Konto angegeben)"
+msgstr ""
+"Gibt den derzeitigen Status zurück (den globalen Status, es sei denn, es "
+"wird ein Konto angegeben)"
 
 #: ../src/gajim-remote.py:242
-msgid "Returns current status message (the global one unless account is specified)"
-msgstr "Gibt die derzeitige Statusnachricht zurück (die globale, es sei denn, es wird ein Konto angegeben)"
+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
 msgid "Returns number of unread messages"
@@ -7796,74 +8314,97 @@ msgid "XML to send"
 msgstr "Zu sendender XML-Code"
 
 #: ../src/gajim-remote.py:262
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird der XML-Code an alle Konten gesendet"
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
+"der XML-Code an alle Konten gesendet"
 
 #: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Status ändern"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Picture to use"
+msgstr "Spitzname, der benutzt werden soll"
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Konto, an welches der XML-Code gesendet wird; falls nicht angegeben, wird "
+"der XML-Code an alle Konten gesendet"
+
+#: ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Verarbeite einen xmpp:/-URI"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "Zu verarbeitender URI"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr "Konto, mit dem er verarbeitet werden soll"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Nachrichteninhalt"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Neuen Chatraum betreten"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "Chatraum"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Jabber-ID des Chatraums"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "Spitzname"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Spitzname, der benutzt werden soll"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "Passwort"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Das Passwort, um den Chatraum zu betreten"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr "Das Konto, mit dem Sie den Chatraum betreten möchten"
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Bitte überprüfen Sie, ob Gajim läuft"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Ein- oder Ausblenden des Hauptfensters"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_Jabber-ID\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7872,15 +8413,17 @@ msgstr ""
 "'%s' ist nicht in Ihrer Kontaktliste.\n"
 "Bitte geben Sie ein Konto zum Senden der Nachricht an."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Kein aktives Konto"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
-msgstr "Gajim scheint nicht gestartet zu sein, daher kann gajim-remote nicht genutzt werden."
+msgstr ""
+"Gajim scheint nicht gestartet zu sein, daher kann gajim-remote nicht genutzt "
+"werden."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7889,16 +8432,16 @@ msgstr ""
 "Verwendung: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Parameter:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s nicht gefunden"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -7907,25 +8450,31 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Der Befehl ist einer von:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Zu viele Argumente.\n"
-"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu erhalten"
+"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
+"erhalten"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 "Argument \"%(arg)s\" wurde nicht definiert. \n"
-"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu erhalten"
+"Geben Sie \"%(basename)s help %(command)s\" ein, um weitere Informationen zu "
+"erhalten"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Falscher URI"
 
@@ -7952,184 +8501,185 @@ 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."
-msgstr "Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
+msgstr ""
+"Bitte wählen Sie zuerst einen anderen Namen für Ihr derzeitiges Design."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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."
+msgstr ""
+"Entweder sind Sie nicht mehr im Chatraum \"%(room)s\" oder \"%(nick)s\" hat "
+"den Chatraum verlassen."
 
-#: ../src/groupchat_control.py:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Spitzname einfügen"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Unterhaltung mit "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Unterhaltung fortsetzen"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228
-#: ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Jeder Teilnehmer darf Ihre vollständige Jabber-ID sehen"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Chatraum-Aufzeichnung ist aktiviert"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Ein neuer Chatraum wurde erstellt"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, 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:1246
+#: ../src/groupchat_control.py:1231
 #, 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"
+msgstr ""
+"%(nick)s wurde von %(who)s aus dem Chatraum geworfen. Grund: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt. Grund: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272
-#: ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_control.py:1288
-#: ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326
-#: ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "Zugehörigkeit geändert:"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
-msgstr "Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
+msgstr ""
+"Chatraum-Konfiguration wurde auf \"ausschließlich Mitgleider\" geändert"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "Computer wird heruntergefahren"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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"
+msgstr ""
+"** Mitgliedschaft von %(nick)s wurde von %(actor)s auf %(affiliation)s "
+"gesetzt"
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s ist gegangen"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s hat den Chatraum betreten"
 
-#: ../src/groupchat_control.py:1473
-#: ../src/gui_interface.py:919
-#: ../src/history_window.py:442
-#: ../src/notify.py:250
+#: ../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 ist jetzt %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
-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:1712
-#: ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940
-#: ../src/gui_interface.py:1975
-#: ../src/message_window.py:227
-#: ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301
-#: ../src/roster_window.py:3990
+#: ../src/groupchat_control.py:1690
+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: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 "_Nicht noch einmal fragen"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Thema ändern"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Bitte wählen Sie ein neues Thema"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Spitzname ändern"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Lösche %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8137,23 +8687,22 @@ msgstr ""
 "Der Chatraum wird endgültig gelöscht.\n"
 "Sie können hier einen Grund angeben:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Sie können auch einen alternativen Chatraum eintragen:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rauswerfen"
 
-#: ../src/groupchat_control.py:1968
-#: ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -8163,130 +8712,136 @@ msgid "A programming error has been detected"
 msgstr "Es wurde ein Programmfehler entdeckt"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Der Fehler ist vermutlich nicht fatal, sollte aber trotzdem den Entwicklern gemeldet werden."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Der Fehler ist vermutlich nicht fatal, sollte aber trotzdem den Entwicklern "
+"gemeldet werden."
 
 #: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "Fehler melden"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171
-#: ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
-msgstr "Konnte nicht an %s schreiben. Die Sitzungmanagment-Unterstützung wird nicht funktionieren"
+msgstr ""
+"Konnte nicht an %s schreiben. Die Sitzungmanagment-Unterstützung wird nicht "
+"funktionieren"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ist nicht Ihr Standard-Jabber-Client"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 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:772
+#: ../src/gtkgui_helpers.py:820
 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"
+msgstr ""
+"Immer beim Programmstart prüfen, ob Gajim der Standard-Jabber-Client ist"
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Erweiterung wird nicht unterstützt."
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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?"
+msgstr ""
+"Bild kann nicht im %(type)s-Format gespeichert werden. Als %(new_filename)s "
+"speichern?"
 
-#: ../src/gtkgui_helpers.py:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Bild speichern unter …"
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, 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 ""
-"Der gewünschte Benutzername wird bereits im Chatraum %s verwendet oder wurde von einem anderen Benutzer registriert.\n"
+"Der gewünschte Benutzername wird bereits im Chatraum %s verwendet oder wurde "
+"von einem anderen Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Benutze bei einem Konflikt immer diesen Spitznamen"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Akzeptieren Sie diese Anfrage vom Konto %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorisierung für %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205
-#: ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../src/gui_interface.py:544
-#: ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558
-#: ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "Fehler beim Senden von %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599
-#: ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Abonnementanfrage"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Der Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8294,105 +8849,119 @@ msgstr ""
 "Er wird Ihnen von nun an als offline angezeigt.\n"
 "Möchten Sie ihn von Ihrer Kontaktliste entfernen?"
 
-#: ../src/gui_interface.py:663
-#: ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Abbestellt"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Die Verbindung mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s hat das Thema in %(subject)s geändert"
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer an"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "Der Chatraum zeigt nun abwesende Teilnehmer nicht mehr an"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 msgid "A non-privacy-related room configuration change has occurred"
-msgstr "Eine nicht Privatsphären-bezogene Chatraum-Konfigurations-Änderung ist aufgetreten"
+msgstr ""
+"Eine nicht Privatsphären-bezogene Chatraum-Konfigurations-Änderung ist "
+"aufgetreten"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt aktiviert"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Die Chatraum-Aufzeichnung ist jetzt deaktiviert"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Der Chatraum ist jetzt nicht mehr anonym"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Der Chatraum ist jetzt semi-anonym"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Der Chatraum ist jetzt komplett anonym"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Für das Betreten des Chatraumes %s wird ein Passwort benötigt."
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:1137
-msgid "You configured Gajim to use GPG agent, but there is no GPG 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"
+#: ../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"
+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:1139
-#: ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne Ihren GPG-Schlüssel verbunden"
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG Passphrase ist falsch"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG-Schlüssel ist nicht vertrauenswürdig"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:1170
-msgid "The GPG 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:1198
+msgid ""
+"The GPG 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:1182
-msgid "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment variable probably not \t\t\t\tcorrectly set)"
-msgstr "Gnome Keyring ist installiert, wurde aber nicht \t\t\t\t\t\t\tkorrekt gestartet (die Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t\tkorrekt gesetzt gesetzt)"
+#: ../src/gui_interface.py:1210
+#, fuzzy
+msgid ""
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
+msgstr ""
+"Gnome Keyring ist installiert, wurde aber nicht \t\t\t\t\t\t\tkorrekt "
+"gestartet (die Umgebungsvariablen sind möglicherweise nicht \t\t\t\t\t\t"
+"\tkorrekt gesetzt gesetzt)"
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Neue E-Mail über %(gmail_mail_address)s empfangen"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8407,44 +8976,43 @@ msgstr ""
 "Betreff: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte Ihnen eine Datei senden."
 
-#: ../src/gui_interface.py:1417
-#: ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Entfernter Kontakt unterbrach die Dateiübertragung"
 
-#: ../src/gui_interface.py:1419
-#: ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Fehler beim Öffnen der Datei:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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."
+msgstr ""
+"Die Dateiübertragung der Datei %(filename)s von %(name)s wurde gestoppt."
 
-#: ../src/gui_interface.py:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8453,242 +9021,291 @@ msgstr ""
 "Die Nachricht von %s konnte nicht entschlüsselt werden.\n"
 "Eventuell wurde sie verändert."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Die Nachricht konnte nicht entschlüsselt werden"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Benutzernamenkonflikt"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Fehler:"
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../src/gui_interface.py:1722
-msgid "You are already connected to this account with the same resource. Please type a new one"
-msgstr "Sie sind mit diesem Konto bereits mit derselben Ressource verbunden. Bitte geben Sie eine neue Ressource ein"
+#: ../src/gui_interface.py:1753
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Sie sind mit diesem Konto bereits mit derselben Ressource verbunden. Bitte "
+"geben Sie eine neue Ressource ein"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s möchte einen Sprachchat beginnen."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 msgid "Voice Chat Request"
 msgstr "Anfrage für Sprachchat"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Fehler bei der Überprüfung des SSL-Zertifikats"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, 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 ""
-"Es trat ein Fehler bei der Überprüfung des SSL-Zertifikats Ihres Jabber-Servers auf: %(error)s\n"
+"Es trat ein Fehler bei der Überprüfung des SSL-Zertifikats Ihres Jabber-"
+"Servers auf: %(error)s\n"
 "Möchten Sie sich dennoch zum Server verbinden?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriere den Fehler für dieses Zertifikat."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "SSL-Zertifikat-Fehler"
 
 # FIXME: Check English. Should be:
 # your connection has been hacked.
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, 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 ""
-"Das SSL-Zertifikat %(account)s scheint sich geändert zu haben oder die Verbindung wurde angegriffen.\n"
+"Das SSL-Zertifikat %(account)s scheint sich geändert zu haben oder die "
+"Verbindung wurde angegriffen.\n"
 "Alter Fingerabdruck: %(old)s\n"
 "Neuer Fingerabdruck: %(new)s\n"
 "\n"
-"Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats aktualisieren?"
+"Möchten Sie sich dennoch verbinden und den Fingerabdruck des Zertifikats "
+"aktualisieren?"
 
-#: ../src/gui_interface.py:1936
-#: ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
-#: ../src/gui_interface.py:1937
-msgid "You are about to send your password on an unencrypted connection. Are you sure you want to do that?"
-msgstr "Sie sind dabei, Ihr Passwort über eine nicht verschlüsselte Verbindung zu senden. Sind Sie sicher, dass Sie dies tun möchten?"
+#: ../src/gui_interface.py:1970
+#, 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 ""
+"Sie sind dabei, Ihr Passwort über eine unsichere Verbindung zu senden. Sind "
+"Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
+"installieren, um dieses Problem zu beheben.)"
 
-#: ../src/gui_interface.py:1939
-#: ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, ich möchte dies trotz Sicherheitsbedenken tun"
 
-#: ../src/gui_interface.py:1972
-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 "Sie sind dabei, Ihr Passwort über eine unsichere Verbindung zu senden. Sind Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu installieren, um dieses Problem zu beheben.)"
+#: ../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 ""
+"Sie sind dabei, Ihr Passwort über eine unsichere Verbindung zu senden. Sind "
+"Sie sicher, dass Sie dies tun möchten? (Es ist ratsam, PyOpenSSL zu "
+"installieren, um dieses Problem zu beheben.)"
+
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Sie sind dabei, Ihr Passwort über eine nicht verschlüsselte Verbindung zu "
+"senden. Sind Sie sicher, dass Sie dies tun möchten?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "PEP-Knoten wurde nicht entfernt"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Der PEP-Knoten %(node)s wurde nicht entfernt: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547
-#: ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Emoticons deaktiviert"
 
-#: ../src/gui_interface.py:2548
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
-msgstr "Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind deaktiviert."
+#: ../src/gui_interface.py:2623
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Das konfigurierte Emoticon-Set wurde nicht gefunden. Emoticons sind "
+"deaktiviert."
 
-#: ../src/gui_interface.py:2570
-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 "Ihr konfiguriertes Emoticon-Set kann nicht geladen werden. Sie müssen 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: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."
+msgstr ""
+"Ihr konfiguriertes Emoticon-Set kann nicht geladen werden. Sie müssen "
+"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:2598
-#: ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG 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)."
+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:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG-Schlüssel abgelaufen"
 
 # TODO: GPG/PGP unification in original strings needed
 # FIXME: should be "has expired"
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, python-format
 msgid "Your GPG 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."
+msgstr ""
+"Ihr GPG-Schlüssel ist abgelaufen. Sie werden ohne OpenPGP-Verschlüsselung "
+"mit %s verbunden."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf Abbrechen."
+msgstr ""
+"Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
+"Abbrechen."
 
 #: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "Neuer Gruppenchat"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 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:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Kann Verlaufs-Datenkbank nicht finden"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontakte"
 
 #. holds time
-#: ../src/history_manager.py:174
-#: ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:180
-#: ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. holds message
-#: ../src/history_manager.py:188
-#: ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Nachricht"
 
-#: ../src/history_manager.py:248
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE LÄUFT)"
+#: ../src/history_manager.py:241
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Möchten Sie die Datenbank aufräumen? (NICHT EMPFOHLEN, WENN GAJIM GERADE "
+"LÄUFT)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Der reservierte Datenbankspeicherplatz wird nicht freigegeben, er wird nur wiederverwendbar. Wenn Sie den Speicherplatz wirklich reduzieren möchten, klicken Sie JA, ansonsten NEIN.\n"
+"Der reservierte Datenbankspeicherplatz wird nicht freigegeben, er wird nur "
+"wiederverwendbar. Wenn Sie den Speicherplatz wirklich reduzieren möchten, "
+"klicken Sie JA, ansonsten NEIN.\n"
 "\n"
 "Falls Sie JA klicken, warten Sie danach bitte einen Augenblick …"
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Exportiere Verlauf …"
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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] "Möchten Sie wirklich alle Logs des ausgewählten Kontakts löschen?"
 msgstr[1] "Möchten Sie wirklich alle Logs der ausgewählten Kontakte löschen?"
 
-#: ../src/history_manager.py:583
-#: ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Dies ist ein unwiderruflicher Vorgang."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -8727,36 +9344,35 @@ msgstr "Der Status ist jetzt: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Der Status ist jetzt: %(status)s"
 
-#: ../src/htmltextview.py:513
-#: ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Chatraum"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Nachrichten"
 
@@ -8768,22 +9384,22 @@ msgstr "- Nachrichten werden aufgezeichnet"
 msgid "- messages will not be logged"
 msgstr "- Nachrichten werden nicht aufgezeichnet"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s änderte seinen Status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s angemeldet"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s abgemeldet"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Einzelne neue Nachricht von %(nickname)s"
@@ -8808,7 +9424,7 @@ msgstr "Neue Nachricht von %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Neue Nachricht von %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorieren"
 
@@ -8816,22 +9432,18 @@ msgstr "Ignorieren"
 msgid "Retrieving profile..."
 msgstr "Empfange Profil …"
 
-#: ../src/profile_window.py:110
-#: ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Datei ist leer"
 
-#: ../src/profile_window.py:113
-#: ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Datei existiert nicht"
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127
-#: ../src/profile_window.py:143
-#: ../src/roster_window.py:2850
-#: ../src/roster_window.py:2861
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
@@ -8841,7 +9453,9 @@ msgstr "Informationen empfangen"
 
 #: ../src/profile_window.py:326
 msgid "Without a connection you can not publish your contact information."
-msgstr "Sie müssen angemeldet sein, um Kontaktinformationen veröffentlichen zu können."
+msgstr ""
+"Sie müssen angemeldet sein, um Kontaktinformationen veröffentlichen zu "
+"können."
 
 #: ../src/profile_window.py:339
 msgid "Sending profile..."
@@ -8856,248 +9470,319 @@ msgid "vCard publication failed"
 msgstr "Veröffentlichung der vCard fehlgeschlagen"
 
 #: ../src/profile_window.py:362
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler aufgetreten. Versuchen Sie es später erneut."
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Bei der Veröffentlichung Ihrer persönlichen Informationen ist ein Fehler "
+"aufgetreten. Versuchen Sie es später erneut."
 
-#: ../src/roster_window.py:280
-#: ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Alle Konten"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt Ihren Status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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."
+msgstr ""
+"Wenn \"%s\" diese Anfrage akzeptiert, können Sie seinen/ihren Status sehen."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, 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:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG ist nicht benutzbar"
 
 # TODO: GPG/PGP unification in original strings needed
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, 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:2148
-#: ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:2149
-#: ../src/roster_window.py:3395
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-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: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?"
+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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "Nicht synchronisiert"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Gajim wirklich beenden?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Möchten Sie Gajim wirklich verlassen?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Gajim immer schließen"
 
-#: ../src/roster_window.py:2333
-#: ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Dateiübertragung abbrechen"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2334
-msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
-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:2403
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+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:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Sie müssen sie lesen, bevor das Konto entfernt wird."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Der Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:2581
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport austauschen."
+#: ../src/roster_window.py:2655
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Sie können nun keine Nachrichten mehr mit Kontakten über diesen Transport "
+"austauschen."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transporte werden entfernt"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "Sie können nun keine Nachrichten mehr mit Kontakten über diese Transporte austauschen: %s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+msgstr ""
+"Sie können nun keine Nachrichten mehr mit Kontakten über diese Transporte "
+"austauschen: %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 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?"
+msgstr ""
+"Sie sind dabei, einen Kontakt zu blockieren. Wollen Sie wirklich fortfahren?"
 
-#: ../src/roster_window.py:2655
-msgid "This contact will see you offline and you will not receive messages he will send you."
-msgstr "Der Kontakt wird Sie als offline sehen und Sie werden von ihm keine Nachrichten empfangen, die er Ihnen sendet."
+#: ../src/roster_window.py:2733
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+"Der Kontakt wird Sie als offline sehen und Sie werden von ihm keine "
+"Nachrichten empfangen, die er Ihnen sendet."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Kontakt umbenennen"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, 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:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Gruppe umbenennen"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, 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:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel zuweisen"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, 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"
+msgstr ""
+"Sie sind dabei, \"%(name)s\" (%(jid)s) aus der Kontaktliste zu entfernen.\n"
 
-#: ../src/roster_window.py:3217
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch die Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als offline sehen wird."
+#: ../src/roster_window.py:3310
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch die "
+"Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
+"offline sehen wird."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Möchten Sie fortsetzen?"
 
-#: ../src/roster_window.py:3226
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch die Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als offline sehen wird."
+#: ../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."
+msgstr ""
+"Durch das Entfernen dieses Kontaktes entziehen Sie ihm auch die "
+"Berechtigung, Ihren Status zu sehen, wodurch der Kontakt Sie nur noch als "
+"offline sehen wird."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 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"
+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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakte werden von Ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Durch das Entfernen dieser Kontakte:%s\n"
-"entziehen Sie ihnen auch die Berechtigung, Ihren Status zu sehen, wodurch die Kontakte Sie nur noch als offline sehen werden."
+"entziehen Sie ihnen auch die Berechtigung, Ihren Status zu sehen, wodurch "
+"die Kontakte Sie nur noch als offline sehen werden."
 
-#: ../src/roster_window.py:3295
-msgid "You are about to send a custom status. Are you sure you want to continue?"
-msgstr "Sie sind dabei, einen speziellen Status zu senden. Wollen Sie wirklich fortfahren?"
+#: ../src/roster_window.py:3390
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want  to continue?"
+msgstr ""
+"Sie sind dabei, einen speziellen Status zu senden. Wollen Sie wirklich "
+"fortfahren?"
 
-#: ../src/roster_window.py:3297
-#, python-format
-msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he will see your global status."
-msgstr "Der Kontakt wird Sie vorläufig als %(status)s sehen, aber nur bis Sie Ihren Status ändern. Dann wird er Ihren globalen Status sehen."
+#: ../src/roster_window.py:3392
+#, 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 ""
+"Der Kontakt wird Sie vorläufig als %(status)s sehen, aber nur bis Sie Ihren "
+"Status ändern. Dann wird er Ihren globalen Status sehen."
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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."
+msgstr ""
+"Sie müssen ein Konto erstellen, bevor Sie sich zum Jabber-Netzwerk verbinden "
+"können."
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
-msgstr "Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
+msgstr ""
+"Das Speichern von Metakontakten wird von Ihrem Server nicht unterstützt"
 
-#: ../src/roster_window.py:3899
-msgid "Your server does not support storing metacontacts information. So those 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:4022
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"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:3984
-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:4114
+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:3986
-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 "Metakontakte sind eine Möglichkeit, mehrere Kontakte in einer Zeile zu gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere Jabber- oder Transport-Konten hat."
+#: ../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."
+msgstr ""
+"Metakontakte sind eine Möglichkeit, mehrere Kontakte in einer Zeile zu "
+"gruppieren. Sie werden normalerweise verwendet, wenn eine Person mehrere "
+"Jabber- oder Transport-Konten hat."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Ungültiger Datei-URI:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Sende %s an %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "%s und %s zu Metakontakt zusammenführen"
@@ -9107,132 +9792,130 @@ msgstr "%s und %s zu Metakontakt zusammenführen"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718
-#: ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798
-#: ../src/statusicon.py:248
-#: ../src/statusicon.py:295
-#: ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "über das Konto %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "an das Konto %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "über das Konto %s"
 
-#: ../src/roster_window.py:4847
-#: ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Gespeicherte Chaträume …"
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "des Kontos %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "für das Konto %s"
 
-#: ../src/roster_window.py:4963
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Musiktitel veröffentlichen"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Musiktitel veröffentlichen"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Dienste konfigurieren …"
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "Alle _maximieren"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153
-#: ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Nachricht an die Gruppe _senden"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "An alle Benutzer"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "An alle angemeldeten Benutzer"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "Kontakte verwalten"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Befehl ausführen …"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Transport verwalten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Ändern"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maximieren"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "Wieder ve_rbinden"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Verbindung trennen"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "_Verlaufsmanager"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Chatraum betreten …"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht …"
 
@@ -9240,14 +9923,12 @@ msgstr "Ändere Statusnachricht …"
 msgid "Waiting for results"
 msgstr "Warte auf Ergebnisse"
 
-#: ../src/search_window.py:132
-#: ../src/search_window.py:210
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Fehler im empfangenen Datenformular"
 
 #. No result
-#: ../src/search_window.py:166
-#: ../src/search_window.py:202
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Kein Ergebnis"
 
@@ -9260,19 +9941,18 @@ msgstr "Fehler beim Schreiben auf Festplatte"
 msgid "Subject: %s"
 msgstr "Thema: %s"
 
-#: ../src/session.py:429
-#: ../src/session.py:464
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Bestätigen Sie diese Sitzungsoptionen"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Der entfernte Client will eine Sitzung mit diesen Features aushandeln:\n"
 "\n"
@@ -9295,121 +9975,126 @@ msgstr ""
 "\n"
 "Mit der Sitzung fortfahren?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht …"
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "in der _Kontaktliste"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Dieses Menü ausblenden"
 
-#: ../src/tooltips.py:347
-#: ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:350
-#: ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [blockiert]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimiert]"
 
-#: ../src/tooltips.py:474
-#: ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Letzter Status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " seit %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Nicht verbunden"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Musiktitel:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Benachrichtigungen"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Übertragen: "
 
-#: ../src/tooltips.py:664
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:670
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?Transferstatus:Pausiert"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Übertrage"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9417,66 +10102,440 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich veraltet oder defekt"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Unbekannt"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Time:Unbekannt"
 
-#: ../src/vcard.py:299
-#: ../src/vcard.py:309
-#: ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Mitgliedschaft:</b>"
 
-#: ../src/vcard.py:344
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Dieser Kontakt ist an Ihrem Status interessiert, aber Sie sind nicht an seinem interessiert"
+#: ../src/vcard.py:343
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Dieser Kontakt ist an Ihrem Status interessiert, aber Sie sind nicht an "
+"seinem interessiert"
 
-#: ../src/vcard.py:346
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Sie sind am Status des Kontakts interessiert, aber er ist nicht an Ihrem interessiert"
+#: ../src/vcard.py:345
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Sie sind am Status des Kontakts interessiert, aber er ist nicht an Ihrem "
+"interessiert"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Sie sind nicht am Status des Kontakts interessiert, und er ist nicht Ihrem interessiert"
+#: ../src/vcard.py:349
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Sie sind nicht am Status des Kontakts interessiert, und er ist nicht Ihrem "
+"interessiert"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
-msgstr "Sie warten auf die Antwort des Kontaktes bezüglich Ihrer Abonnement-Anfrage"
+msgstr ""
+"Sie warten auf die Antwort des Kontaktes bezüglich Ihrer Abonnement-Anfrage"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Es gibt keine offenen Abonnementanfragen."
 
-#: ../src/vcard.py:364
-#: ../src/vcard.py:418
-#: ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " Resource mit Priorität "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "_Gruppenchat betreten …"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "Kont_akt hinzufügen …"
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Dienste durchsuchen"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "B_efehl ausführen …"
+
+#~ msgid "_Modify Account"
+#~ msgstr "Konto _bearbeiten"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Persönliche Ereignisse"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Chat starten …"
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Kontoänderung"
+
+#~ 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 ""
+#~ "Aktivieren Sie diese Option, damit sich Gajim über Port 5223 verbindet, "
+#~ "auf dem auch veraltete Server SSL-Fähigkeiten unterstützen. Beachten Sie, "
+#~ "dass diese Option die neuere TLS-Verschlüsselung deaktiviert, die Gajim "
+#~ "standardmäßig verwendet, wenn der Server sie unterstützt."
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Persönliche Informationen bearbeiten …"
+
+#~ msgid "Hostname: "
+#~ msgstr "Server-Name: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Falls aktiviert, wird Gajim das Passwort mit ausschließlichen Lese-"
+#~ "Rechten für Sie in ~/.gajim/config speichern."
+
+#~ msgid "Port: "
+#~ msgstr "Port: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "_Passphrase speichern (unsicher)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Keepalive-Pakete senden"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "_SSL verwenden (veraltet)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "Mit Status _abgleichen"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Nachricht des Tages (MOTD) _löschen"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "Servernachricht _senden …"
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Nachricht empfangen\n"
+#~ "Kontakt abgemeldet\n"
+#~ "Kontakt ändert Status\n"
+#~ "Gruppenchat-Nachricht hervorgehoben\n"
+#~ "Gruppenchat-Nachricht empfangen\n"
+#~ "Anfrage zur Dateiübertragung\n"
+#~ "Dateiübertragung begonnen\n"
+#~ "Dateiübertragung beendet"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "Kontakt(e)\n"
+#~ "Gruppe(n)\n"
+#~ "Alle"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Chatraum betreten …"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "Jabber-ID/E-Mail-Adresse _kopieren"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "Link-Adresse _kopieren"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "E-Mail-Pr_ogramm öffnen"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "Link im Br_owser öffnen"
+
+#~ msgid "_Start Chat"
+#~ msgstr "Chat _starten"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Konto-Reihe\n"
+#~ "Gruppen-Reihe\n"
+#~ "Kontakt-Reihe\n"
+#~ "Chat-Banner"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Spitz_name ändern …"
+
+#~ msgid "Change _Subject..."
+#~ msgstr "_Thema ändern …"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Chat_raum einrichten …"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Chatraum auflösen"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Chatraum _verwalten"
+
+#~ msgid "Send _File"
+#~ msgstr "_Datei senden"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Zur Kont_aktliste hinzufügen"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "Private Nachricht _senden"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Jabber-ID oder Kontaktname eingeben\n"
+#~ "Gruppenchat-Verlauf\n"
+#~ "Gesamter Chatverlauf"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Konten verwalten"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Kontakt zur Kontaktliste hinzufügen (Strg+D)"
+
+# TODO: Synchronize with other strings concerning bookmarks
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Diesen Chatraum speichern (Strg+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Chatverlauf anzeigen (Strg+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Thema des Chatraums ändern (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Spitzname ändern (Strg+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Weiteren Kontakt zur Unterhaltung einladen (Strg+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Datei senden (Strg+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Emoticons (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Schriftformatierung (Alt+M)"
+
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Liste erweiterter Funktionen anzeigen (Alt+D)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Benutzerprofil anzeigen (Strg+I)"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Zwischen Audio-Sitzung umschalten"
+
+#~ msgid "Toggle video session"
+#~ msgstr "Zwischen Video-Sitzung umschalten"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Immer\n"
+#~ "Nur beim Schreiben\n"
+#~ "Deaktiviert"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Bei jedem Programmstart automatisch erkennen\n"
+#~ "Immer die GNOME-Standard-Anwendungen verwenden\n"
+#~ "Immer die KDE-Standard-Anwendungen verwenden\n"
+#~ "Immer die Xfce-Standard-Anwendungen verwenden\n"
+#~ "Benutzerdefiniert"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "separate Kontaktliste mit getrennter Unterhaltung\n"
+#~ "separate Kontaktliste mit Einzelunterhaltung\n"
+#~ "Einzelfenster\n"
+#~ "separate Kontaktliste gruppiert nach Benutzerkonto\n"
+#~ "separate Kontaktliste gruppiert nach Typ"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Chatfenster öffnen\n"
+#~ "Benachrichtigung anzeigen\n"
+#~ "Nur in der Kontaktliste anzeigen"
+
+# TODO: Review original string
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "nicht in Ihrer Liste stehen und in deren Liste Sie nicht stehen\n"
+#~ "in Ihrer Liste stehen und in deren Liste Sie stehen\n"
+#~ "nicht in Ihrer Liste stehen, in deren Liste Sie aber stehen\n"
+#~ "in Ihrer Liste stehen, in deren Liste Sie aber nicht stehen"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "_Kontakt hinzufügen …"
+
+#~ msgid "Fea_tures"
+#~ msgstr "Fea_tures"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Dateiübertragungen"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil und A_vatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Konten"
+
+#~ msgid "_Contents"
+#~ msgstr "In_halte"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Einstellungen"
+
+#~ msgid "_Quit"
+#~ msgstr "_Beenden"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Einzelne _Nachricht senden …"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Einzelne Nachricht _senden"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Gruppenchat"
+
+#~ msgid "Enable"
+#~ msgstr "Aktivieren"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Konto bearbeiten …"
+
+#~ msgid "Wrong host"
+#~ msgstr "Falscher Server"
+
+# TODO: Review by german translators. Get closer to original string and write instead: Ungültige lokale Adresse? :-O
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Ungültige Lokale Adresse!"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (auch python-pysqlite2 genannt) fehlt. Abbruch …"
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Anklickbare Links"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr "Anklickbare URLs im Chatfenster."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Erfordert python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "Der GTK+-Laufzeitumgebung fehlt die libglade-Unterstützung"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Bitte entfernen Sie Ihre derzeitige GTK+-Laufzeitumgebung und "
+#~ "installieren Sie die aktuelle Version von %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Bitte stellen Sie sicher, dass die auf Ihrem Computer verwendeten "
+#~ "Versionen von GTK+ und PyGTK libglade-Unterstützung besitzen."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim benötigt PySQLite2 zum Starten"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Eingehende Nachricht:"
+
 #~ msgid "_Outgoing message:"
 #~ msgstr "_Ausgehende Nachricht:"
+
 #~ msgid "gtk-ok"
 #~ msgstr "gtk-ok"
+
 #~ msgid ""
 #~ "The host %s you configured as the ft_add_hosts_to_send advanced option is "
 #~ "not valid, so ignored."
@@ -9487,46 +10546,61 @@ msgstr " Resource mit Priorität "
 # TODO: GPG/PGP unification in original strings needed
 #~ msgid "OpenPGP passphrase was not given"
 #~ msgstr "Keine OpenPGP-Passphrase gewählt."
+
 #~ msgid ""
 #~ "To continue sending and receiving messages, you will need to reconnect."
 #~ msgstr ""
 #~ "Um weiterhin Nachrichten senden und empfangen zu können, müssen Sie sich "
 #~ "erneut verbinden."
+
 #~ msgid ""
 #~ "You are not connected or not visible to others. Your message could not be "
 #~ "sent."
 #~ msgstr ""
 #~ "Sie sind nicht verbunden oder für andere nicht sichtbar. Ihre Nachricht "
 #~ "konnte nicht versendet werden."
+
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Diese Nachricht ist verschlüsselt]"
+
 #~ msgid "%i days ago"
 #~ msgstr "Vor %i Tagen"
+
 #~ msgid "Trayicon"
 #~ msgstr "Tray-Symbol"
+
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Ein Symbol im Systemtray, das den Status widerspiegelt."
+
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
 #~ "sources."
 #~ msgstr ""
 #~ "Erfordert python-gnome2-extras oder die Kompilation des Trayicon-Moduls "
 #~ "aus den Gajim-Quellen"
+
 #~ msgid "Requires PyGTK >= 2.10."
 #~ msgstr "Erforder PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Spezielle Be_nachrichtigung hinzufügen"
+
 # TODO: GPG/PGP unification in original strings needed
 #~ 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.)"
@@ -9534,20 +10608,28 @@ msgstr " Resource mit Priorität "
 #~ "Verwendung: /%(command)s <Aktion>, sendet eine Aktion an den aktuellen "
 #~ "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."
+
 #~ msgid "Enable link-local/zeroconf messaging"
 #~ msgstr "Aktiviere Anzeige von Kontakten im LAN über Zeroconf."
+
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Spitzname nicht gefunden: %s"
+
 #~ msgid "This group chat has no subject"
 #~ msgstr "Dieser Chatraum hat kein Thema"
+
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "%(contact_jid)s in %(room_jid)s eingeladen"
+
 #, fuzzy
 #~ msgid "Nickname not found"
 #~ msgstr "Spitzname nicht gefunden: %s"
@@ -9563,24 +10645,28 @@ msgstr " Resource mit Priorität "
 #~ "wenn er kein \"@\" enthält. Wenn die Jabber-ID derzeit im Chatraum ist, "
 #~ "wird sie zusätzlich herausgeworfen. Leerzeichen im Spitznamen werden "
 #~ "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 ""
 #~ "Verwendung: /%s [Grund], schließt das aktuelle Fenster oder den aktuellen "
 #~ "Tab, optional mit der Angabe eines Grundes."
+
 #~ msgid ""
 #~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
 #~ "optionally providing a reason."
 #~ msgstr ""
 #~ "Verwendung: /%s <Jabber-ID> [Grund], lädt die Jabber-ID in den aktuellen "
 #~ "Chatraum ein, optional mit der Angabe eines Grundes."
+
 #~ msgid ""
 #~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
 #~ "optionally using specified nickname."
@@ -9596,6 +10682,7 @@ msgstr " Resource mit Priorität "
 #~ "Verwendung: /%s <Spitzname> [Grund], entfernt den Inhaber des angegebenen "
 #~ "Spitznamens aus dem Chatraum, optional mit Grund. Leerzeichen im "
 #~ "Spitznamen werden nicht unterstützt."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
 #~ "message to the occupant specified by nickname."
@@ -9603,16 +10690,20 @@ msgstr " Resource mit Priorität "
 #~ "Verwendung: /%s <Spitzname> [Nachricht], öffnet ein privates "
 #~ "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
 #~ "Spitznamens."
+
 #~ msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 #~ 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 ""
 #~ "Verwendung: /%s [topic], zeigt oder aktualisiert das derzeitige Chatraum-"
 #~ "Thema."
+
 #~ msgid ""
 #~ "Usage: /%s <message>, sends a message without looking for other commands."
 #~ msgstr ""
@@ -9625,46 +10716,56 @@ msgstr " Resource mit Priorität "
 #~ "messages."
 #~ msgstr ""
 #~ "Verwendung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Chatraum."
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "B_OSH-Port:"
+
 #~ msgid "Show _roster"
 #~ msgstr "_Kontaktliste anzeigen"
+
 #~ msgid "Modify Account"
 #~ msgstr "Konto bearbeiten"
+
 #~ msgid "Use _custom port:"
 #~ msgstr "Verwende _benutzerdefinierten Port:"
+
 #~ msgid ""
 #~ "%(title)s by %(artist)s\n"
 #~ "from %(source)s"
 #~ msgstr ""
 #~ "%(title)s von %(artist)s\n"
 #~ "aus %(source)s"
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Immer OS/X-Standardprogramme verwenden"
-#~ msgid "Custom"
-#~ msgstr "Benutzerdefiniert"
+
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Die Gegenseite hat Dateiübertragung gestoppt"
+
 #~ msgid "Generic"
 #~ msgstr "Allgemein"
+
 #~ msgid "Mood"
 #~ msgstr "Stimmung"
+
 #~ msgid "Activity"
 #~ msgstr "Aktivität"
+
 #~ msgid "Your JID:"
 #~ msgstr "Ihre Jabber-ID:"
+
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Doppelte Jabber-ID"
+
 #~ msgid "This account is already configured in Gajim."
 #~ msgstr "Dieser Kontakt wurde bereits konfiguriert."
+
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compilation of gtkspell module from "
 #~ "Gajim sources."
 #~ msgstr ""
 #~ "Erfordert python-gnome2-extras oder die Kompilation des gtkspell-Moduls "
 #~ "aus den Gajim-Quellen."
+
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim-Konto %s"
+
 #~ msgid "Name:"
 #~ msgstr "_Name:"
-
diff --git a/po/el.po b/po/el.po
index 644f5f455..cb5e6f1e3 100644
--- a/po/el.po
+++ b/po/el.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-08-19 23:46+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team:  <>\n"
@@ -24,63 +24,12 @@ msgstr ""
 "X-Poedit-Country: GREECE\n"
 "X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,-1,-1,623\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Συμμετοχή σε _Ομαδική Συζήτηση..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Προσθήκη επαφής..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "Εύρεση _υπηρεσιών"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Εκτέλεση εντολής..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Επεξεργασία λογαριασμού"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "Άνοιγμα υπάρχοντος μενού"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Προσωπικές πληροφορίες"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Έναρξη συζήτησης"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Κατάσταση"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -91,83 +40,90 @@ msgstr ""
 "\n"
 "Παρακαλώ περιμένετε..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Παρακαλώ επιλέξτε ένα από τα παρακάτω:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "Παρακαλώ συμπληρώστε τα δεδομένα για τον υπάρχων λογαριασμό σας"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Χρήση πιστοποίησης"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Σύνδεση όταν επιλέξω Τέλος"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Οδηγός δημιουργίας λογαριασμού"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Έχω ήδη ένα λογαριασμό που θέλω να χρησιμοποιήσω"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Διαχείριση..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Κανένα"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Μεσολαβητής:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "_Αποθήκευση κωδικού"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -175,150 +131,146 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό προτού μπορέσετε\n"
 "να συνδεθείτε στο Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "Για προ_χωρημένους"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Τέλος"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Εξυπηρετητής:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Κωδικός πρόσβασης:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Θύρα:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Εξυπηρετητής:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Διάφορα</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Προσωπικές πληροφορίες</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Ιστορικό</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+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/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Τροποποίηση λογαριασμού"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Λογαριασμοί"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Λίστα διαχειριστών"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Χρήση πιστοποίησης"
+
+#: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Αυτόματη επανασύνδεση κατά την απώλεια της σύνδεσης"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Αλλα_γή κωδικού πρόσβασης"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Επιλέξτε το ώστε το Gajim να συνδεθεί στην θύρα 5223 όπου οι παλαιότεροι "
-"διακομιστές αναμένουν SSL σύνδεση. Σημειώστε ότι το Gajim χρησιμοποιεί "
-"κρυπτογράφηση TLS αυτόματα αν αυτή η δυνατότητα του γνωστοποιηθεί από τον "
-"διακομιστή, και ότι με αυτή την επιλογή απενεργοποιείται το TLS"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Επιλογή _κλειδιού..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Πατήστε για να αλλάξετε τον κωδικό του λογαριασμού"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Τροποποίηση προσωπικών πληροφοριών..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Ε-Mail:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Όνομα:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Γενικά"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Εξυπηρετητής:"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -327,8 +279,12 @@ msgstr ""
 "σας, ώστε να υπάρχουν περισσότερες πιθανότητες να δουλέψει η μεταφορά "
 "αρχείων."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
+
+#: ../data/gui/accounts_window.ui.h:26
 #, fuzzy
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
@@ -337,16 +293,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα στέλνει πακέτα keep-alive ώστε να αποφύγει την "
 "διακοπή της σύνδεσης"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Εάν επιλεγεί, το Gajim θα αποθηκεύσει τον κωδικό πρόσβασης στο ~/.gajim/"
-"config με δικαίωμα ανάγνωσης μόνο για εσάς"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -354,8 +301,7 @@ msgstr ""
 "Εάν επιλεγεί, το Gajim, όταν εκτελεστεί, θα συνδεθεί αυτόματα στο jabber "
 "χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -365,47 +311,46 @@ msgstr ""
 "στο κάτω μέρος της λίστας επαφών) θα αλλάζουν ανάλογα την κατάσταση αυτού "
 "του λογαριασμού"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Οι πληροφορίες για εσάς, όπως αποθηκεύονται στο διακομιστή"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Επώνυμο:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Συ_γχώνευση λογαριασμών"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Δεν έχει επιλεχτεί κλειδί"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Κανένα"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Προσωπικές πληροφορίες"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Θύρα: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Π_ροτεραιότητα:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -416,23 +361,21 @@ msgstr ""
 "είναι συνδεδεμένες χρησιμοποιώντας τον ίδιο λογαριασμό· Η εφαρμογή με την "
 "μεγαλύτερη προτεραιότητα λαμβάνει τα γεγονότα"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Μεσολαβητής:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "_Μετονομασία"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "_Πόρος: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -447,211 +390,100 @@ msgstr ""
 "ίδια στιγμή. Ο πόρος με τη μεγαλύτερη προτεραιότητα θα λαμβάνει τα γεγονότα. "
 "(βλέπε και πιο κάτω)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Αποθήκευση _φράσης πρόσβασης (περιορισμένη ασφάλεια)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Αποστολή πακέτων keep-alive"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Χρήση _SSL (για λόγους συμβατότητας)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Χρήση μεσολαβητών μεταφοράς αρχείων"
-
-#: ../data/glade/account_modification_window.glade.h:47
-#, fuzzy
-msgid "_Adjust to status"
-msgstr "Αδυναμία φόρτωσης"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Όνομα:"
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Ιστορικό</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "Αδυναμία φόρτωσης"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Λογαριασμοί"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Χρήση πιστοποίησης"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Ε-Mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Όνομα:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
-
-#: ../data/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Επώνυμο:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Συ_γχώνευση λογαριασμών"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "_Μετονομασία"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Αποστολή πακέτων keep-alive"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Χρήση προσαρμοσμένου διακομιστή/θύρας"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Χρήση προσαρμοσμένης θύρας:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Χρήση μεσολαβητών μεταφοράς αρχείων"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Τροποποίηση προσωπικών πληροφοριών..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Ενεργοποίηση"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Εξυπηρετητής:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Διαχείριση..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Θύρα:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Λογαριασμός:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/gui/add_new_contact_window.ui.h:2
 #, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Προσθήκη νέας επαφής"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -659,648 +491,710 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Ομάδα:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Όνομα χρήστη:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Πρωτόκολλο:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Εγγραφή"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 #, fuzzy
 msgid "<b>An error has occurred:</b>"
 msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 #, fuzzy
 msgid "<b>Choose command to execute:</b>"
 msgstr "Η εκτέλεση του \"%s\" απέτυχε"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 #, fuzzy
 msgid "Check once more"
 msgstr "Αντικατάσταση _όλων"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
 msgid "Error description..."
 msgstr "Σφάλμα συστήματος"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 #, fuzzy
 msgid "Please wait while retrieving command list..."
 msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 #, fuzzy
 msgid "Please wait while the command is sending..."
 msgstr "Ανανέωση περιεχομένων αρχείου, παρακαλώ περιμένετε..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Παρακαλώ περιμένετε..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr ""
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Περιγραφή</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 #, fuzzy
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 "<b>ΣΗΜΕΙΩΣΗ:</b> Θα πρέπει να επανεκκινήσετε το gajim για να εφαρμοστούν "
 "μερικές ρυθμίσεις"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Επεξεργασία ρυθμίσεων για προχωρημένους"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Φιλτράρισμα:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Διαγραφή MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Διαγράφει το Μήνυμα της ημέρας (MOTD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Στέλνει ένα μήνυμα στους χρήστες που είναι συνδεδεμένοι σε αυτό το διακομιστή"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Ορισμός MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Ορίζει το Μήνυμα της ημέρας (MOTD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Κονσόλα _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Ενημέρωση MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Ενημερώνει το Μήνυμα της ημέρας (MOTD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Διαχειριστής"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Αποστολή μηνύματος διακομιστή"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Ενέργειες</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Συνθήκες</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Ήχοι</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Προχωρημένες ενέργειες"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Προχωρημένος έλεγχος ειδοποιήσεων"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Όλες οι καταστάσεις"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Απομακρυσμένος"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Απασχολημένος"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Αφανής"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Εκτέλεση εντολής"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Μη διαθέσιμος"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 #, fuzzy
 msgid "One or more special statuses..."
 msgstr "Ορισμένες ειδικές καταστάσεις..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Online εγχειρίδιο για αυτήν την εφαρμογή"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Αναπαραγωγή ήχου"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
+#: ../data/gui/advanced_notifications_window.ui.h:25
+#, fuzzy
+msgid "Receive a Message"
+msgstr "Νέο προσωπικό μήνυμα"
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/gui/advanced_notifications_window.ui.h:26
 msgid "When "
 msgstr "Όταν"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 #, fuzzy
 msgid "_Disable auto opening chat window"
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 #, fuzzy
 msgid "_Disable existing popup window"
 msgstr "Εμφάνιση ενός αναδυόμενου παραθύρου κατά την λήψη μιας κλήσης"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 #, fuzzy
 msgid "_Disable existing sound for this event"
 msgstr "Το αρχείο ήχου για το παρόν γεγονός δεν υπάρχει."
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Χρήση ενός παραθύρου κουβέντας με _καρτέλες"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "_Προβολή τίτλου στο κουμπί"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "_Προβολή τίτλου στο κουμπί"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "και εγώ"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "Επαφές"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
-"επαφές\n"
-"ομάδες\n"
-"όλοι"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "για"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Εγγραφή:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "Όνομα εικονιδίου"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Τελευταία τροποποίηση:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "Προσθήκη νέας εγγραφής στο μενού"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 #, fuzzy
 msgid "You have received new entry:"
 msgstr "Προσθήκη νέας εγγραφής στο μενού"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "Επαφές"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Ιστορικό</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Αλλαγή κωδικού πρόσβασης"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Εισάγετε τον ξανά για επιβεβαίωση:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Εισάγετε νέο κωδικό πρόσβασης:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Εισάγετε το νέο μήνυμα κατάστασης</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Ενεργό"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Δωμάτιο:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Προκαθορισμένα μηνύματα:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Αποθήκευση ως προκαθορισμένο..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Συμμετοχή σε _ομαδική συζήτηση"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Προσθήκη στη λίστα επαφών"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Αντιγραφή τοποθεσίας δεσμού"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Άνοιγμα προγράμματος αλληλογραφίας"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Άνοιγμα δεσμού στον περιηγητή"
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Αποστολή"
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Έναρξη συζήτησης"
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "Αδυναμία φόρτωσης"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "Παρατηρητές"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 #, fuzzy
 msgid "A_sk to see his/her status"
 msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "Προσθήκη ειδικής _γνωστοποίησης"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "Ανάθεση κλειδιού Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Αδυναμία εκτέλεσης της εντολής:"
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Επεξεργασία _ομάδων"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 #, fuzzy
 msgid "In_vite to"
 msgstr "Αδυναμία φόρτωσης"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Επαφές"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Αφαίρεση"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Προσαρμοσμένο μέγεθος _γραμματοσειράς:"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Αποστολή μονού _μηνύματος"
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "Αποστολή _αρχείου"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Έναρξη _συζήτησης"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Εν/Απενεργοποίηση _κρυπτογράφησης OpenPGP"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Προσθήκη στη λίστα επαφών"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Απαγόρευσε τον/την να βλέπει την κατάστασή μου"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Μετονομασία"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Συνδρομή"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "εννιά"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Τροποποίηση ομάδων"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Περιγραφή</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Χαρακτηριστικά διακομιστή"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Ακύρωση μεταφοράς αρχείου"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχείου"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../data/gui/filetransfers.ui.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Ακυρώνει την επιλεγμένη μεταφορά αρχείου και διαγράφει το ημιτελές αρχείο"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Εκκα_θάριση"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Μεταφορές αρχείων"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Αποκρύπτει το παράθυρο"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Αφαίρεση της μεταφοράς αρχείου από τη λίστα."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../data/gui/filetransfers.ui.h:9
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr ""
 "Αφαιρεί τις ολοκληρωμένες, ακυρωμένες και αποτυχημένες μεταφορές από τη λίστα"
 
-#: ../data/glade/filetransfers.glade.h:10
+#: ../data/gui/filetransfers.ui.h:10
 #, fuzzy
 msgid "Shows a list of file transfers between you and others"
 msgstr "Δείχνει τη λίστα μεταφορών αρχείων μεταξύ εσάς και άλλων"
 
-#: ../data/glade/filetransfers.glade.h:11
+#: ../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,76 +1202,75 @@ msgstr ""
 "Αυτή η ενέργεια αφαιρεί μια μεταφορά αρχείου από τη λίστα. Αν η μεταφορά "
 "είναι ενεργή, τότε πρώτα διακόπτεται και μετά αφαιρείται"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Ειδοποίηση όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Συνέχεια"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Άνοιγμα του περιέχοντος φακέλου"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Παύση"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "λίστα μεταφορών αρχείων"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Χρώματα κατάστασης κουβέντας</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
+#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Λογαριασμός\n"
-"Ομάδα\n"
-"Επαφή\n"
-"Banner"
+msgid "Account row"
+msgstr "Λογαριασμός"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Έντονα"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+#, fuzzy
+msgid "Chat Banner"
+msgstr "Πανό:"
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Σύνθεση"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Επικοινωνία"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Γραμματοσειρά:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Προσαρμογή θεμάτων Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Έξω"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Ομάδα"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Ανενεργό"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Πλάγια"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1385,7 +1278,7 @@ msgstr ""
 "MUC\n"
 "Μηνύματα"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1393,116 +1286,75 @@ msgstr ""
 "Μηνύματα προς\n"
 "ομαδικές κουβέντες"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Παύση"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Χρώμα _κειμένου:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Γρα_μματοσειρά κειμένου:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "Χρώμα _φόντου:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "Αλλαγή _ψευδώνυμου"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "Αλλαγή _θέματος"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "Ρύθμιση _δωματίου"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Διαχείριση σελιδοδεικτών"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "_Συντονιστής"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Ενέργειες για τους συμμετέχοντες"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Αποστολή _αρχείου"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Προσθήκη στη λίστα επαφών"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Διαχειριστής"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Απαγόρευση πρόσβασης"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Μέλος"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Ιδιοκτήτης"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Αποστολή προσωπικού μηνύματος"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Φωνή"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
 msgid "Create new post"
 msgstr "Δημιουργία νέου προφίλ"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Από"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Θέμα"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1519,26 +1371,20 @@ msgstr ""
 "Gajim. Γενικά να αποφύγετε να διαγράψετε από επαφές που συζητάτε αυτή τη "
 "στιγμή."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Διαγραφή"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Εξαγωγή"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Διαχειριστής βάσης δεδομένων ιστορικού Gajim"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1547,427 +1393,441 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Αναζήτηση στη βάση δεδομένων"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Όνομα επαφής"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Ομαδικές συζητήσεις"
+
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Αναζήτηση"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού συζητήσεων"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+msgid "Bro_wse Rooms"
+msgstr "_Περιήγηση"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε ομαδική κουβέντα"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/gui/join_groupchat_window.ui.h:4
 #, fuzzy
-msgid "Join this room automatically when I connect"
+msgid "Join this room _automatically when I connect"
 msgstr "Καθορισμός του προφίλ μου κατά τη σύνδεση"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Ψευδώνυμο:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Κωδικός πρόσβασης:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Πρόσφατα:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Εξυπηρετητής:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Διαχείριση λογαριασμών"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Αυτόματη είσοδος"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Διαχείριση σελιδοδεικτών"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Εμφάνιση κατάστασης:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Εξυπηρετητής:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Ρυθμίσεις δωματίου"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Συνέχεια"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "Διαγραφή"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Ιδιότητες</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr "Σύνδεση HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Διαχείριση προφίλ μεσολαβητή"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Κωδικός πρόσβασης:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Μεσολαβητής:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Θύρα:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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 "_Χρήση μεσολαβητή"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Χρήση πιστοποίησης"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "Διεύ_θυνση:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Όνομα:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Τύπος:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "Όν_ομα χρήστη:"
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
-
-#: ../data/glade/message_window.glade.h:2
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Αλλαγή _ψευδώνυμου"
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "έχει την προσοχή του στην κουβέντα"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Αποστολή"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Φράση πρόσβασης"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Επεξεργασία προχωρημένων ρυθμίσεων</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Εφαρμογές</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Ενέργειες</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Ενέργειες</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Χρώματα κατάστασης κουβέντας</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Συνθήκες</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Ιστορικό</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Επιλογές Gmail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "backdrops.list"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Προκαθορισμένα μηνύματα κατάστασης</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Ιστορικό</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Προσθήκη κανόνα</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Οπτικές γνωστοποιήσεις</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Προχωρημένοι"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Προχωρημένοι"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Όλες τις καταστάσεις κουβέντας\n"
-"Μόνο αν κάποιος γράφει ένα μήνυμα\n"
-"Απενεργοποιημένες"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Όλες οι καταστάσεις"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Να επιτρέπεται η α_ποστολή πληροφοριών για το λειτ. σύστημα"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Να επιτρέπεται η α_ποστολή πληροφοριών για το λειτ. σύστημα"
+
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Να επιτρέπονται οι εμφανίσεις/γνωστοποιήσεις όταν είμαι _απομακρ./μη διαθ./"
 "απασχολ./αφανής"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Απομακρυσμένος"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Αυτόματη ανίχνευση σε κάθε έναρξη του Gajim\n"
-"Πάντα χρήση των προεπιλεγμένων εφαρμογών του GNOME\n"
-"Πάντα χρήση των προεπιλεγμένων εφαρμογών του KDE\n"
-"Προσαρμοσμένες ρυθμίσεις"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Σύνθεση"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Όνομα επαφής"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Απενεργοποιημένο"
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Εμφάνιση των ά_βαταρ των επαφών στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Εμφάνιση των _μηνυμάτων κατάστασης στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1978,7 +1838,7 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1988,7 +1848,7 @@ msgstr ""
 "μια συζήτηση που έχετε με μια επαφή. Εδώ μπορείτε να ορίσετε τι πληροφορίες "
 "θέλετε να στέλνετε στους άλλους."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1996,12 +1856,12 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -2010,26 +1870,26 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτό το δωμάτιο κατά την "
 "εκκίνηση"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2037,7 +1897,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -2045,7 +1905,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2053,7 +1913,15 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
+"και στις ομαδικές κουβέντες"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2061,7 +1929,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2069,14 +1937,14 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών "
 "και στις ομαδικές κουβέντες"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2087,20 +1955,20 @@ msgstr ""
 "ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει "
 "όλα τα μηνύματα από κάθε επαφή που δεν έχετε στη λίστα επαφών σας"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2110,13 +1978,13 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2124,108 +1992,133 @@ msgstr ""
 "Αν δεν απενεργοποιηθεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το "
 "':)' με τις αντίστοιχες γραφικές φατσούλες"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Παρά_θυρο ενός μηνύματος:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Δια_χείριση..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Ποτέ"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Τροποποίηση λογαριασμού"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Ειδοποίησε με για αυτό"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Ειδοποίηση σε νέο μήνυμα στο _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Προσωπικές πληροφορίες"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Εμφάνισε το"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Εξυπηρετητής:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Προβολή τίτλου στο κουμπί"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Τα_ξινόμηση επαφών βάσει κατάστασης"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Εξορισμού _σετ εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "Πάγωσε"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Θέμα:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2233,7 +2126,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2241,612 +2134,576 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 #, fuzzy
 msgid "Use system _default"
 msgstr "Χρήση _προκαθορισμένου χρώματος"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Π_ριν το ψευδώνυμο:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Φατσούλες:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Διαχειριστής αρχείων:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Να _αγνοούνται γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "%d μη αναγνωσμένο μεμονωμένο μήνυμα"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Εφαρμογή αλληλογραφίας:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Άνοιγμα..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "Επανα_φορά προεπιλεγμένων χρωμάτων"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "Μήνυμα κατά_στασης:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "Συμμετοχή σε _ομαδική συζήτηση"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "Εκτέλεση στο Τερματικό"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "λεπτά"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 #, fuzzy
 msgid "Privacy Lists:"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 #, fuzzy
 msgid "<b>Add / Edit a rule</b>"
 msgstr "Επεξεργασία καταχώρησης μενού"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Λίστα κανόνων</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 #, fuzzy
 msgid "<i>Privacy List</i>"
 msgstr "backdrops.list"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 #, fuzzy
 msgid "Active for this session"
 msgstr "Αποθήκευ_ση της συνεδρίας"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 #, fuzzy
 msgid "Active on each startup"
 msgstr "Εμφάνιση συμβουλών κατά την _εκκίνηση"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Όλα"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "όλους κατά συνδρομή"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Επέτρεψε"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Άρνηση"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Σειρά:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "όλους κατά συνδρομή"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "όλους στην ομάδα"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Και τα δυο"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Από"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "ένα"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "δύο"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 #, fuzzy
 msgid "to send me messages"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 #, fuzzy
 msgid "to send me queries"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 #, fuzzy
 msgid "to send me status"
 msgstr "Αποστολή επιλεγμένου αρχείου στο \"%s\""
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
 msgid "to view my status"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
 msgid "<b>Address</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "_Ορισμός Avatar"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Birthday:</b>"
 msgstr "Γενέθλια:"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 #, fuzzy
 msgid "<b>Company:</b>"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Ήχοι</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Τμήμα:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "Ε-Mail:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Επιπλέον διεύθυνση:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Οικογένεια:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Ιστορικό</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "<b>Ιστορικό</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Ιστορικό</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Ψευδώνυμο:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Τηλέφωνο:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Συνθήκες</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Τ.Κ.:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Ιδιότητες</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Ιστορικό</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Ήχοι</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Περί"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr ""
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Προσωπικές πληροφορίες"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Δουλειά"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Αφαίρεση λογαριασμού από το Gajim και από τον _εξυπηρετητή"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Διαγραφή"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Προσθήκη επαφής..."
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Χαρακτηριστικά διακομιστή"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Μεταφορές αρχείων"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Συχνές ερωτήσεις (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Online βοήθεια"
 
-#: ../data/glade/roster_window.glade.h:8
-#, fuzzy
-msgid "Profile, A_vatar"
-msgstr "Όνομα προφίλ:"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Εμφάνιση _αποσυνδεδεμένων χρηστών"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Εμφάνιση _λίστας επαφών"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Λογαριασμοί"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Ενέργειες"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Περιεχόμενα"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_Συχνές ερωτήσεις"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Προτιμήσεις"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Έξοδος"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Αποστολή μονού _μηνύματος"
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Προβολή"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Προσθήκη _επαφής"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "Πληροφορίες επαφής"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Αναζήτηση"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Μετάβαση"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Διεύθυνση:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Εγγραφή σε"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Άκυρο"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Από:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Απάντηση σε αυτό το μήνυμα"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Α_ποστολή"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Προς:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Απάντηση"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Αποστολή & κλείσιμο"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 #, fuzzy
 msgid "Au_thorize"
 msgstr "Αμερική/Πορτ-Ο-Πρενς"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../data/gui/subscription_request_window.ui.h:2
 #, fuzzy
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
 "Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
@@ -2855,187 +2712,202 @@ msgstr ""
 "Αρνηθείτε εξουσιοδότηση σε μια επαφή ώστε να μη μπορεί να γνωρίζει πότε "
 "είστε συνδεδεμένος"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Αίτηση εγγραφής"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Άρνηση"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "το JID της επαφής με την οποία θέλετε να συνομιλήσετε"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Σίγαση ήχων"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Αποστολή ενός _μηνύματος"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Εμφάνιση όλων των γεγονότων που εκκρεμούν"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Κατάσ_ταση"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Ομαδική συζήτηση"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Ιστορικό</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Πόρος:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Ρυθμίσεις</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Περιγραφή</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Σχόλια"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Ρύθμιση _δωματίου"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Επικοινωνία"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Πληροφορίες επαφής"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Περισσότερα"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "Επιλογή Εικόνας"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Ιστορικό</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Κίνηση Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Είσοδος δεδομένων XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Ενεργοποίηση"
+#: ../data/gui/xml_console_window.ui.h:4
+msgid "Hide IN stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:5
+msgid "Hide IQ stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Μήνυμα"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Παρουσία"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Επεξεργασία λογαριασμού..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Τοπικό jid:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Προσωπικά"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Πόρος:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3060,7 +2932,7 @@ msgstr "Ακέραιος"
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Χρώμα"
 
@@ -3198,134 +3070,134 @@ msgstr "Σουηδικά"
 msgid "Chinese (Ch)"
 msgstr "Κινέζικα (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr "Δε μπορεί να σταλεί το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/chat_control.py:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "Υπογράμμιση"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Ψευδώνυμο"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "_Γραμματοσειρά:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Πληροφορίες επαφής"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Λίστα ενεργών, ολοκληρωμένων και σταματημένων μεταφορών αρχείων"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Χρήση πιστοποίησης"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Χρήση πιστοποίησης"
@@ -3333,58 +3205,58 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3392,130 +3264,140 @@ msgstr ""
 "Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
 "μήνυμα θα χαθεί."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "Ο %(nick)s είναι τώρα %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "δημιουργία βάσης δεδομένων ιστορικού"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
-#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Το Gajim τώρα θα κλείσει"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
 
-#: ../src/common/check_paths.py:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "δημιουργία φακέλου %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Αλλαγή πληροφοριών κατάστασης"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Αλλαγή κατάστασης"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Ελεύθερος για κουβέντα"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Συνδεδεμένος"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Μην ενοχλείτε"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Περιγραφή παρουσίας:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Η κατάσταση άλλαξε."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d μη αναγνωσμένο μήνυμα"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3620,9 +3502,9 @@ msgstr ""
 "συμπτυχθεί"
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Προεπιλογή"
@@ -3884,11 +3766,11 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3896,7 +3778,7 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα κοιτάει αν κάθε επαφή που δεν είχε ως τώρα "
 "άβαταρ, έχει τώρα ή έχει αλλά είναι πεπαλαιωμένη."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:231
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3906,7 +3788,7 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μήνυμα "
 "κατάστασης."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3915,28 +3797,28 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3945,7 +3827,7 @@ msgstr ""
 "Αν είναι ενεργοποιημένο, και τα GTK+ και PyGTK είναι έκδοσης 2.8 και πάνω, "
 "να αναβοσβήνει το παράθυρο όταν υπάρχουν εκκρεμή γεγονότα."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:242
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3956,7 +3838,7 @@ msgstr ""
 "δωμάτιο προστατευμένο με συνθηματικό. Απενεργοποιήστε αυτή την επιλογή"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3975,51 +3857,51 @@ msgstr ""
 "'pertype' - Κάθε τύπος μηνύματος έχει το δικό του παράθυρο. Αυτή η επιλογή "
 "απαιτεί επανεκκίνηση του gajim για να εφαρμοστεί."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Αν Αληθές, πατώντας το πλήκτρο διαφυγής, κλείνει η καρτέλα/το παράθυρο."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Αποκρύπτει τα κουμπιά σε παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Αποκρύπτει την κεφαλίδα στο παράθυρο προσωπικής κουβέντας"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 #, fuzzy
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Αποκρύπτει τη λίστα συμμετεχόντων στο παράθυρο ομαδικής κουβέντας"
 
-#: ../src/common/config.py:251
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4027,198 +3909,219 @@ msgid ""
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../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:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "Αν Ψευδέςν, δε θα εμφανίζεται πλέον το άβαταρ στο παράθυρο κουβέντας"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Ειδική παράκαμψη για το jabberd2"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4227,126 +4130,131 @@ msgstr ""
 "διακομιστές που ορίστηκαν στην επιλογή file_transfer_proxies για τη μεταφορά "
 "αρχείων."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
+
+#: ../src/common/config.py:431
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'ναι', 'όχι', ή 'και τα δύο'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'ναι', 'όχι' ή ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Είμαι έξω απολαμβάνοντας την πραγματική ζωή."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Είμαι διαθέσιμος."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Είμαι ελεύθερος για κουβέντα."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Επιστρέφω αμέσως."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Δεν είμαι διαθέσιμος."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Μην ενοχλείτε."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Γεια χαρά!"
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:490
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4355,108 +4263,100 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "θαλασσί"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Λάθος διακομιστής"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
 "%s"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
@@ -4464,77 +4364,77 @@ msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Δεν ήταν δυνατή η σύνδεση στην ομαδική συζήτηση"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτή την ομαδική συζήτηση."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Δεν επιτρέπεται η δημιουργία ομαδικών συζητήσεων."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Δεν είστε στη λίστα μελών."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4673,28 +4573,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/common/connection.py:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Aυτό το μήνυμα είναι *κρυπτογραφημένο* (Δείτε:JEP:`27`)]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4703,154 +4603,154 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Επανασύνδεση χειροκίνητα."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Μη έγκυρη απόκριση"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Η μεταφορά %s αποκρίθηκε εσφαλμένα στην αίτηση εγγραφής."
 
-#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Άγνωστη έκδοση του D-Bus: %s"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε τη σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το όνομα χρήστη και το συνθηματικό σας."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Δημιουργήθηκε σφάλμα κατά την αφαίρεση της εργασίας !"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Επαφές"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Παρατηρητές"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Μεταφορές"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 #, fuzzy
 msgid "Not in roster"
 msgstr "Εκτέλεση στο Τερματικό"
@@ -4860,43 +4760,59 @@ msgstr "Εκτέλεση στο Τερματικό"
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "Δεν υπάρχει υποστήριξη D-Bus για την python σε αυτόν τον υπολογιστή"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Οι δυνατότητες του Gajim για D-Bus δε θα χρησιμοποιηθούν"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Δεν βρέθηκε το pysqlite2 (ή python-pysqlite2). Έξοδος..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr ""
+"Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα ή το άρθρωμα της python "
+"λείπει"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Μη διαθέσιμη υπηρεσία: Το Gajim δεν τρέχει ή δεν είναι ενεργοποιημένο το "
 "remote_control"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr ""
 "Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα ή το άρθρωμα της python "
 "λείπει"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Ο δίαυλος μηνυμάτων δεν είναι διαθέσιμος.\n"
-"Παρακαλώ συμβουλευτείτε το http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr "Ο δίαυλος του session δεν είναι διαθέσιμος."
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
+msgstr "Ο δίαυλος του session δεν είναι διαθέσιμος."
 
 #: ../src/common/fuzzyclock.py:38
 msgid "twelve"
@@ -5061,241 +4977,278 @@ msgstr "Τέλος εβδομάδας"
 msgid "Weekend!"
 msgstr "Σαββατοκύριακο!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του χρήστη."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Απαιτείται η διεύθυνση του διακομιστή."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Μη έγκυρος χαρακτήρας στο όνομα του διακομιστή."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Μη έγκυρος χαρακτήρας στον πόρο."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "Απα_σχολημένος"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Απασχολημένος"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Μη διαθέσιμος"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "Διαθέσιμος για _κουβέντα"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Διαθέσιμος για κουβέντα"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Διαθέσιμος"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Διαθέσιμος"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Συνδέεται"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "Α_πομακρυσμένος"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "Απ_οσυνδεδεμένος"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Αποσυνδεδεμένος"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "Αόρατ_ος"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?κατάσταση επαφής: Άγνωστη"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?κατάσταση επαφής: Υπάρχουν σφάλματα"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Καμία"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Προς"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Και τα δυο"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Τίποτα"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Εγγραφή"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Διαχειριστές"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Συμμετέχοντες"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Συμμετέχων"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Επισκέπτες"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Επισκέπτης"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Κανένας"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Ιδιοκτήτης"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Διαχειριστής"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Μέλος"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "έχει την προσοχή του στην κουβέντα"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "κάνει κάτι άλλο"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 msgid "is composing a message..."
 msgstr "γράφει ένα μήνυμα..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "σταμάτησε για λίγο να γράφει ένα μήνυμα"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Αποστολή μηνύματος"
 msgstr[1] "Αποστολή μηνύματος"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Από %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Ρυθμίσεις δωματίου"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5305,17 +5258,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Mέγεθος: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "κυανό"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
@@ -6028,22 +6038,22 @@ msgstr ""
 msgid "Writing"
 msgstr "Δουλειά"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Άγνωστος τύπος %s "
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6051,19 +6061,19 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:91
 #, fuzzy, python-format
 msgid "Unable to bind to port %s."
 msgstr "Δεν ήταν δυνατό το άνοιγμα της οθόνης \"%s\"."
 
-#: ../src/common/socks5.py:87
+#: ../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:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6129,100 +6139,96 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Σφάλμα κατά την προσθήκη της υπηρεσίας. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Απενεργοποιημένο"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Προεπιλεγμένα μηνύματα κατάστασης"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Ενεργοποίηση"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Δεν υπάρχει διαθέσιμο λεξικό για τη γλώσσα %s"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, 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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Νέα είσοδος τώρα;"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Αν θέλετε να εφαρμόσετε άμεσα τις αλλαγές, θα πρέπει να αποσυνδεθείτε και να "
 "συνδεθείτε ξανά."
 
-#: ../src/config.py:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Αδιάβαστα γεγονότα"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να διαβάσετε όλα τα εκκρεμή "
 "γεγονότα."
 
-#: ../src/config.py:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6230,154 +6236,154 @@ msgstr ""
 "Αυτό το όνομα χρησιμοποιείται ήδη από κάποιον άλλον από τους λογαριασμούς "
 "σας. Παρακαλώ, επιλέξτε άλλο όνομα."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δε μπορεί να είναι κενό."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δε μπορεί να έχει κενά."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "Διαχείριση λογαριασμών"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά τη λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Σφάλμα κατά τη λήψη των μυστικών κλειδιών OpenPGP σας."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Επιλογή κλειδιού OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το κλειδί OpenPGP σας"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 #, fuzzy
 msgid "Your server can't save your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε το λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Υπάρχει ήδη τοπικό προφίλ με αυτό το όνομα"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Λίστα Ban"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Λίστα μελών"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Λίστα ιδιοκτητών"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Λίστα διαχειριστών"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Ρόλος"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Απαγορεύεται η πρόσβαση..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6385,11 +6391,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να αποβάλλετε;</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Προσθήκη μέλους..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6397,11 +6403,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε μέλος;</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Προσθήκη ιδιοκτήτη..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6410,11 +6416,11 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε ιδιοκτήτη;</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Προσθήκη διαχειριστή..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6422,7 +6428,7 @@ msgstr ""
 "<b>Ποιόν θέλετε να κάνετε διαχειριστή;</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6439,62 +6445,90 @@ msgstr ""
 "4. τομέας (ταιριάζει ο τομέας, και κάθε χρήστης@τομέας,\n"
 "τομέας/πόρος, ή διεύθυνση που περιέχει υποτομέα."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαίρεση του λογαριασμού %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Απαιτείται κωδικός"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Η σύνδεση απέτυχε"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Τι θέλετε να κάνετε;"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Είσοδος και έξοδος μόνο"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Εκτύπωση όλων των σελίδων"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6502,31 +6536,31 @@ msgstr ""
 "αφαιρέστε το σελιδοδείκτη."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Δεν επιτρέπεται το ψευδώνυμο: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Μη έγκυρη εγγραφή"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6537,36 +6571,36 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6576,7 +6610,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6584,62 +6618,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Σφάλμα κατά τη διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Ενεργό"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Λήφθηκε το πρώτο μήνυμα"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Επόμενο μήνυμα ελήφθη"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Το μήνυμα στάλθηκε"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Επισήμανση "
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Λήφθηκε μήνυμα ομαδικής συζήτησης"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Αντιγραφή διεύθυνσης email"
@@ -6660,46 +6694,46 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Έξοδος"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Α_ναζήτηση για:"
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής αναζήτησης"
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Δικτυακή ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 #, fuzzy
 msgid "Open as _Link"
 msgstr "Το άνοιγμα του συνδέσμου απέτυχε"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6707,7 +6741,7 @@ msgstr[0] "Χθες"
 msgstr[1] "Χθες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
@@ -6824,68 +6858,68 @@ msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στο "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Μη έγκυρη ταυτότητα χρήστη"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Το αναγνωριστικό χρήστη δεν πρέπει να περιέχει έναν πόρο."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Επαφή ήδη στη λίστα επαφών"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Αυτή η επαφή υπάρχει ήδη στη λίστα επαφών σας."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 #, fuzzy
 msgid "User ID:"
 msgstr "Το αναγνωριστικό χρήστη δεν ταιριάζει"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Έκδοση GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Έκδοση PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Δημιουργοί:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Προηγούμενοι δημιουργοί:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "ΕΥΧΑΡΙΣΤΙΕΣ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
@@ -6893,7 +6927,7 @@ msgstr ""
 "Σταύρος Γιαννούρης <stavrosg@hellug.gr>\n"
 "Στάθης Καμπέρης <ekamperi@auth.gr>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6902,44 +6936,44 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Αίτηση εγγραφής για το λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
@@ -6947,74 +6981,74 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "Το όνομα του δωματίου ή του διακομιστή περιέχει μη επιτρεπόμενους χαρακτήρες."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 #, fuzzy
 msgid "This is not a group chat"
 msgstr "Αυτή η μορφή συμπίεσης δεν υποστηρίζεται:"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, fuzzy, python-format
 msgid "%s is not the name of a group chat."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/ παραθύρου ομαδικής κουβέντας."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Εξυπηρετητής"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με το διακομιστή"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Δε μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναρξη κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7024,173 +7058,171 @@ msgstr ""
 "την οποία θέλετε να στείλετε ένα μήνυμα συζήτησης:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Μη έγκυρο JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Δεν ήταν δυνατή η ανάγνωση του \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Σύνδεση επαφής"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση επαφής"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Νέο μήνυμα"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Νέο μονό μήνυμα"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Νέο προσωπικό μήνυμα"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Νέο E-Mail"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Πρόσκληση ομαδικής κουβέντας"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Η επαφή άλλαξε κατάσταση"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Μονό μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Μονό μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Έγινε λήψη του %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Πάγωσε"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Αφαίρεση"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7198,159 +7230,159 @@ msgid ""
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Προσθήκη"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Διαγραφή"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Ομάδα"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Επιθυμώ να σε προσθέσω στη λίστα επαφών μου."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Προσθήκη _επαφής"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, fuzzy, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "backdrops.list"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, fuzzy, python-format
 msgid "Privacy List for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Εικονίδια δράσεων"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Επεξεργασία κανόνα</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Προσθήκη κανόνα</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, fuzzy, python-format
 msgid "Privacy Lists for %s"
 msgstr "Σύνταξη συντόμευσης για :"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Μη έγκυρο όνομα αρχείου"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 #, fuzzy
 msgid "You must enter a name to create a privacy list."
 msgstr "Πρέπει να δώσετε έναν κωδικό για το νέο λογαριασμό."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "Ο/Η %(contact_jid)s σας προσκάλεσε στο %(room_jid)s"
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Επιλογή ήχου"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Αρχεία ήχου Wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Επιλογή εικόνας"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Όταν το %s γίνεται:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Προσθήκη ειδικής ειδοποίησης για το %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Κατάσταση"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "όταν είμαι"
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7358,38 +7390,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7399,77 +7431,77 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Άλλα"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ανακάλυψη υπηρεσιών χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Ανακάλυψη υπηρεσιών"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Η υπηρεσία δεν ήταν δυνατό να βρεθεί"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7477,99 +7509,104 @@ msgstr ""
 "Δεν υπάρχει υπηρεσία στη διεύθυνση που εισάγατε, ή δεν ανταποκρίνεται. "
 "Ελέγξτε τη διεύθυνση και προσπαθήστε ξανά."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Η υπηρεσία δεν είναι περιηγήσιμη"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Αυτού του είδους η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Περιήγηση %s χρησιμοποιώντας το λογαριασμό %s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Περιήγηση"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Εκτέλεση εντολής..."
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Περιγραφή"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 #, fuzzy
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
 "κεντρικό παράθυρο."
 
-#: ../src/disco.py:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Εγγεγραμμένος"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Κόμβος"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 #, fuzzy
 msgid "New post"
 msgstr "_Νέα λίστα..."
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Εγγραφή"
@@ -7619,7 +7656,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7785,103 +7822,91 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "Χαρακτηριστικά διακομιστή"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Αρχείο"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Χρόνος"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Πρόοδος"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Αποθηκεύτηκε στο: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Άνοιγμα του περιέχοντος φακέλου"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Άνοιγμα αρχείου μενού"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "Η σύνδεση με τον απομακρυσμένο ομότιμο δεν ήταν εφικτή."
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Παραλήπτης: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Μήνυμα σφάλματος: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Η μεταφορά αρχείου διακόπηκε"
@@ -7890,7 +7915,7 @@ msgstr "Η μεταφορά αρχείου διακόπηκε"
 msgid "Choose File to Send..."
 msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Περιγραφή: %s"
@@ -7923,12 +7948,12 @@ msgstr "Περιγραφή: %s"
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Δεν είναι δυνατή η αντικατάσταση του υπάρχοντος αρχείου \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../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."
@@ -7936,22 +7961,22 @@ msgstr ""
 "Ένα αρχείο με αυτό το όνομα υπάρχει ήδη και δε μπορείτε να το "
 "αντικαταστήσετε."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Αυτό το αρχείο υπάρχει ήδη"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Δεν είναι δυνατή η εγγραφή στον κατάλογο \"%s\""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Δε μπορείτε να δημιουργήσετε αρχεία σε αυτό τον κατάλογο."
 
@@ -7987,76 +8012,56 @@ msgstr "Αρχείο:"
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Συνέχεια"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Η libglade λείπει από το GTK+"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
-"τελευταία σταθερή έκδοση από %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
-"υποστήριξη για την libglade."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Το Gajim χρειάζεται την pywin32 για να εκτελεστεί"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8064,11 +8069,11 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8114,8 +8119,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "λογαριασμός"
 
@@ -8137,14 +8142,17 @@ msgid "status"
 msgstr "κατάσταση"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "μία από τις: αποσυνδεδεμένος, συνδεδεμένος, κουβέντα, απομακρυσμένος, "
 "εκτεταμένα-απομακρυσμένος, dnd, αόρατος "
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "μήνυμα"
 
@@ -8400,80 +8408,96 @@ 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:277
+#, fuzzy
 msgid "Handle a xmpp:/ uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 #, fuzzy
 msgid "uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "περιεχόμενα μηνύματος"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Σύνδεση σε νέο δωμάτιο"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "room"
 msgstr "Από"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Δωμάτιο:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "nick"
 msgstr "Ψευδώνυμο"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Δεν βρέθηκε το ψευδώνυμο: %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "κωδικός πρόσβασης"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Το Gajim εκτελείται ήδη"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Εμφανίζει ή αποκρύπτει το παράθυρο λίστας επαφών"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8482,31 +8506,31 @@ msgstr ""
 "Η επαφή '%s' δεν είναι στη λίστα σας.\n"
 "Παρακαλώ καθορίστε τον λογαριασμό που θα σταλεί το μήνυμα."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Δεν έχετε κανέναν ενεργό λογαριασμό"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Ορίσματα:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "μη υπαρκτό %s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8515,7 +8539,7 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8524,7 +8548,7 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8533,7 +8557,11 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Το URI \"%s\" δεν είναι έγκυρο."
@@ -8564,199 +8592,200 @@ msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντ
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Εισάγετε ψευδώνυμο"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Ιστορικό συζητήσεων"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Σύνδεση"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Συσχέτιση: "
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Ο/Η %s μπήκε στο δωμάτιο"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 είναι τώρα %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, fuzzy, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1690
 #, fuzzy
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
 
-#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "Μη_ν με ξαναρωτήσεις"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Αλλαγή θέματος"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Αλλαγή ψευδωνύμου"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -8777,27 +8806,27 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Αναφορά σφάλματος"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "<b>Λεπτομέρειες</b>"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά την ανάλυση του αρχείου:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:406
+#: ../src/gtkgui_helpers.py:444
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -8805,36 +8834,36 @@ msgstr ""
 "συνεδριών"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:770
+#: ../src/gtkgui_helpers.py:818
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Θέλετε να αντικατασταθεί;"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Η επέκταση δεν υποστηρίζεται"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Αποθήκευση εικόνας ως..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8844,165 +8873,165 @@ msgstr ""
 "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
 "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "σφάλμα κατά την αποστολή του %s ( %s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Αίτηση εγγραφής"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάστασή της."
 
-#: ../src/gui_interface.py:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Εγγραφή"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτή την ομαδική συζήτηση."
 
-#: ../src/gui_interface.py:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς τη χρήση του OpenPGP κλειδιού σας."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "H φράση πρόσβασης είναι λανθασμένη"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "H φράση πρόσβασης είναι λανθασμένη"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, fuzzy, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Νέα αλληλογραφία στο %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -9012,105 +9041,106 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
 #. ft stopped
-#: ../src/gui_interface.py:1454
+#: ../src/gui_interface.py:1479
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/gui_interface.py:1467
+#: ../src/gui_interface.py:1492
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1471
+#: ../src/gui_interface.py:1496
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/gui_interface.py:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 #, fuzzy
 msgid "Username Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 #, fuzzy
 msgid "Please type a new username for your local account"
 msgstr "<b>Παρακαλώ συμπληρώστε τα δεδομένα για το νέο λογαριασμό σας</b>"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 #, fuzzy
 msgid "Error."
 msgstr "Σφάλμα:"
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Θα πρέπει να προσδιορίσετε ένα όνομα χρήστη !"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9118,15 +9148,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9137,93 +9167,105 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Σύνδεση"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+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"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 #, 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Απαιτείται φράση πρόσβασης"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Εσφαλμένη φράση πρόσβασης"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβασης GPG σας, ή επιλέξτε Ακύρωση."
 
@@ -9232,37 +9274,37 @@ msgstr "Παρακαλώ εισάγετε ξανά τη φράση πρόσβα�
 msgid "_New Group Chat"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Δεν ήταν δυνατή η εύρεση της βάσης δεδομένων ιστορικού"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Επαφές"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Ημερομηνία"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Όνομα χρήστη"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9270,7 +9312,7 @@ msgstr ""
 "Θέλετε να καθαρίσετε τη βάση δεδομένων; (ΑΝΤΕΝΔΕΙΚΝΥΤΑΙ ΙΣΧΥΡΑ ΕΑΝ ΤΟ GAJIM "
 "ΤΡΕΧΕΙ)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9284,16 +9326,16 @@ msgstr ""
 "\n"
 "Σε περίπτωση που επιλέξατε ΝΑΙ, παρακαλώ περιμένετε..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Εξαγωγή ιστορικού..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "Ο %(who)s είπε στις %(time)s: %(message)s\n"
 
-#: ../src/history_manager.py:579
+#: ../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] ""
@@ -9301,11 +9343,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Θέλετε σίγουρα να διαγράψετε τα αρχεία καταγραφής των επιλεγμένων επαφών;"
 
-#: ../src/history_manager.py:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Αυτή η ενέργεια δεν είναι αναστρέψιμη."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
@@ -9346,38 +9388,38 @@ msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Δεν είστε συνδεδεμένος στο διακομιστή"
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "Θέλετε σίγουρα να διαγράψετε το επιλεγμένο μήνυμα;"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Συζητήσεις"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Ομαδικές συζητήσεις"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Προσωπικές συζητήσεις"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Μηνύματα"
 
@@ -9389,22 +9431,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "Ο %(nick)s άλλαξε κατάσταση"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Σύνδεση %(nickname)s"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Αποσύνδεση %(nickname)s"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Νέο μονό μήνυμα από %(nickname)s"
@@ -9429,7 +9471,7 @@ msgstr "Νέο μήνυμα από %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Νέο μήνυμα από %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "εννιά"
@@ -9439,12 +9481,12 @@ msgstr "εννιά"
 msgid "Retrieving profile..."
 msgstr "Όνομα προφίλ:"
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "Διαδρομή αρχείου"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "Δεν υπάρχει τέτοια συζήτηση."
@@ -9452,7 +9494,7 @@ msgstr "Δεν υπάρχει τέτοια συζήτηση."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Δεν ήταν δυνατό το φόρτωμα της εικόνας"
 
@@ -9489,52 +9531,52 @@ msgstr ""
 "Υπήρξε ένα σφάλμα κατά τη δημοσιοποίηση των προσωπικών πληροφοριών σας, "
 "δοκιμάστε αργότερα."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9542,28 +9584,39 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Ακύρωση μεταφοράς αρχείου"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9572,19 +9625,19 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 #, fuzzy
 msgid "You must read them before removing this transport."
 msgstr ""
 "Ανάγνωση όλων των γεγονότων που εκκρεμούν, πριν την αφαίρεση αυτού του "
 "λογαριασμού."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9593,12 +9646,12 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Αυτό το ραντεβού θα απομακρυνθεί οριστικά."
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9607,73 +9660,73 @@ msgstr ""
 "Δε θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Μετονομασία αρχείων"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Πληκτρολογήστε τη φράση πρόσβασης GPG για το λογαριασμό %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 #, fuzzy
 msgid "Rename Group"
 msgstr "Ιδιοκτήτης / Ομάδα"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Επιλέξτε ένα όνομα για τη νέα συνεδρία:"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Διαγραφή ομάδας"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Αφαιρεί μια επαφή από τη λίστα επαφών"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9682,12 +9735,12 @@ msgstr ""
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Τι θέλετε να κάνετε;"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9695,17 +9748,17 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3233
+#: ../src/roster_window.py:3327
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από τη λίστα επαφών σας"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9714,42 +9767,42 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -9757,31 +9810,31 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:3986
+#: ../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."
 msgstr ""
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Αποστολή %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
@@ -9791,137 +9844,140 @@ msgstr "Μετατροπή των %s και %s σε μεταεπαφές"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "στο λογαριασμό %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "/Προβολή/_Διαχείριση"
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "για το λογαριασμό %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "Α_λλαγή μηνύματος κατάστασης"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr ""
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+msgid "Publish Location"
+msgstr ""
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Εύρεση _υπηρεσιών..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Αρχηγός ομάδας παραθύρων"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Σε όλους τους χρήστες"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Σε όλους τους συνδεδεμένους χρήστες"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Μετονομασία αρχείων"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _ομάδων"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Αποστολή μονού μηνύματος"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 #, fuzzy
 msgid "Execute Command..."
 msgstr "Αδυναμία εκτέλεσης της εντολής:"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Μεταφορές"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Προβολή ιδιοτήτων εκτυπωτή"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Αποσύνδεση επαφής"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Αποσύνδεση επαφής"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Διαχειριστής ιστορικού"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Είσοδος σε Ομαδική Συζήτηση"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Αλλαγή μηνύματος κατάστασης..."
 
@@ -9956,9 +10012,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9971,120 +10027,130 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "Αλλαγή μηνύματος _κατάστασης..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Εκτέλεση στο Τερματικό"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "ID συστήματος:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Κατάσταση: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Τελευταία κατάσταση: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr "από τις %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "Σύνδεση"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "Αποσύνδεση επαφής"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Εγγραφή: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Τύπος:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Τροποποίηση λογαριασμού"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10092,30 +10158,30 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?Λειτ. Σύστημα: Άγνωστο"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Πελάτης: Άγνωστος"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "από τις %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Εφαρμογές</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10123,7 +10189,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10131,12 +10197,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10144,18 +10210,305 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Συμμετοχή σε _Ομαδική Συζήτηση..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Προσθήκη επαφής..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "Εύρεση _υπηρεσιών"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Εκτέλεση εντολής..."
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "Επεξεργασία λογαριασμού"
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Προσωπικές πληροφορίες"
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "_Έναρξη συζήτησης"
+
+#~ msgid "_Status"
+#~ msgstr "_Κατάσταση"
+
+#~ msgid "Account Modification"
+#~ msgstr "Τροποποίηση λογαριασμού"
+
+#~ msgid ""
+#~ "Check this so Gajim will connect in port 5223 where legacy servers are "
+#~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+#~ "default if broadcasted by the server, and with this option enabled TLS "
+#~ "will be disabled"
+#~ msgstr ""
+#~ "Επιλέξτε το ώστε το Gajim να συνδεθεί στην θύρα 5223 όπου οι παλαιότεροι "
+#~ "διακομιστές αναμένουν SSL σύνδεση. Σημειώστε ότι το Gajim χρησιμοποιεί "
+#~ "κρυπτογράφηση TLS αυτόματα αν αυτή η δυνατότητα του γνωστοποιηθεί από τον "
+#~ "διακομιστή, και ότι με αυτή την επιλογή απενεργοποιείται το TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Τροποποίηση προσωπικών πληροφοριών..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Εξυπηρετητής:"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Εάν επιλεγεί, το Gajim θα αποθηκεύσει τον κωδικό πρόσβασης στο ~/.gajim/"
+#~ "config με δικαίωμα ανάγνωσης μόνο για εσάς"
+
+#~ msgid "Port: "
+#~ msgstr "Θύρα: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Μεσολαβητής:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Αποθήκευση _φράσης πρόσβασης (περιορισμένη ασφάλεια)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Αποστολή πακέτων keep-alive"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Χρήση _SSL (για λόγους συμβατότητας)"
+
+#, fuzzy
+#~ msgid "_Adjust to status"
+#~ msgstr "Αδυναμία φόρτωσης"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Διαγραφή MOTD"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Αποστολή μηνύματος διακομιστή"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "επαφές\n"
+#~ "ομάδες\n"
+#~ "όλοι"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Συμμετοχή σε _ομαδική συζήτηση"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "Α_ντιγραφή JID/Email διεύθυνσης"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Αντιγραφή τοποθεσίας δεσμού"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Άνοιγμα προγράμματος αλληλογραφίας"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Άνοιγμα δεσμού στον περιηγητή"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Έναρξη συζήτησης"
+
+#, fuzzy
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Λογαριασμός\n"
+#~ "Ομάδα\n"
+#~ "Επαφή\n"
+#~ "Banner"
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "Αλλαγή _ψευδώνυμου"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "Αλλαγή _θέματος"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Ρύθμιση _δωματίου"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Διαχείριση σελιδοδεικτών"
+
+#~ msgid "Send _File"
+#~ msgstr "Αποστολή _αρχείου"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Προσθήκη στη λίστα επαφών"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Αποστολή προσωπικού μηνύματος"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Διαχείριση λογαριασμών"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "Διαγραφή"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Προσθέτει μια επαφή στη λίστα επαφών"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Τοποθέτηση σελιδοδείκτη για αυτό το δωμάτιο"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Αλλαγή _ψευδώνυμου"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "έχει την προσοχή του στην κουβέντα"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Όλες τις καταστάσεις κουβέντας\n"
+#~ "Μόνο αν κάποιος γράφει ένα μήνυμα\n"
+#~ "Απενεργοποιημένες"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Αυτόματη ανίχνευση σε κάθε έναρξη του Gajim\n"
+#~ "Πάντα χρήση των προεπιλεγμένων εφαρμογών του GNOME\n"
+#~ "Πάντα χρήση των προεπιλεγμένων εφαρμογών του KDE\n"
+#~ "Προσαρμοσμένες ρυθμίσεις"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Διαγραφή"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "_Προσθήκη επαφής..."
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "Χαρακτηριστικά διακομιστή"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Μεταφορές αρχείων"
+
+#, fuzzy
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Όνομα προφίλ:"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Λογαριασμοί"
+
+#~ msgid "_Contents"
+#~ msgstr "_Περιεχόμενα"
+
+#~ msgid "_FAQ"
+#~ msgstr "_Συχνές ερωτήσεις"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Προτιμήσεις"
+
+#~ msgid "_Quit"
+#~ msgstr "_Έξοδος"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Αποστολή μονού _μηνύματος"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Αποστολή ενός _μηνύματος"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Κατάσ_ταση"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Ομαδική συζήτηση"
+
+#~ msgid "Enable"
+#~ msgstr "Ενεργοποίηση"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Επεξεργασία λογαριασμού..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Λάθος διακομιστής"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "Δεν βρέθηκε το pysqlite2 (ή python-pysqlite2). Έξοδος..."
+
+#~ msgid ""
+#~ "Session bus is not available.\n"
+#~ "Try reading http://trac.gajim.org/wiki/GajimDBus"
+#~ msgstr ""
+#~ "Ο δίαυλος μηνυμάτων δεν είναι διαθέσιμος.\n"
+#~ "Παρακαλώ συμβουλευτείτε το http://trac.gajim.org/wiki/GajimDBus"
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "Η libglade λείπει από το GTK+"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
+#~ "τελευταία σταθερή έκδοση από %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
+#~ "υποστήριξη για την libglade."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Το Gajim χρειάζεται την PySQLite2 για να εκτελεστεί"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Εισερχόμενο μήνυμα:"
 
@@ -10347,10 +10700,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Gajim account %s"
 #~ msgstr "Λογαριασμός gajim %s"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Προσαρμοσμένες ρυθμίσεις</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Διπλότυπο αναγνωριστικό Jabber"
 
@@ -10418,10 +10767,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
 
-#, fuzzy
-#~ msgid "Old stories"
-#~ msgstr "Παλιό όνομα - Κείμενο - Αριθμός"
-
 #~ msgid "Click to see past conversations with this contact"
 #~ msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
 
@@ -10518,9 +10863,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ "Αποθήκευση _θέσης και μεγέθους για τη λίστα επαφών και για τα παράθυρα "
 #~ "κουβέντας"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Εμφά_νιση το μόνο στο κύριο παράθυρο"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Αυτόματο μήνυμα για κατάσταση απομακρυσμένος"
 
@@ -10544,18 +10886,9 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Προχωρημένος έλεγχος ειδοποιήσεων..."
 
-#~ msgid "_Never"
-#~ msgstr "_Ποτέ"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Ειδοποίησε με για αυτό"
-
 #~ msgid "_Player:"
 #~ msgstr "_Αναπαραγωγέας:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Εμφάνισε το"
-
 #~ msgid "Address"
 #~ msgstr "Διεύθυνση"
 
@@ -11024,9 +11357,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ "αποθήκευσης του ιστορικού των συζητήσεων. Το Gajim μπορεί τώρα να "
 #~ "μετατρέψει το αποθηκευμένο ιστορικό. Να γίνει η μετατροπή;"
 
-#~ msgid "Session bus is not available."
-#~ msgstr "Ο δίαυλος του session δεν είναι διαθέσιμος."
-
 #, fuzzy
 #~ msgid "with account "
 #~ msgstr "λογαριασμός: "
@@ -11178,9 +11508,6 @@ msgstr " πόρος με προτεραιότητα"
 #~ msgid "Always use compact _view"
 #~ msgstr "Να χρησιμοποιείται _πάντα η συμπαγής όψη"
 
-#~ msgid "Banner:"
-#~ msgstr "Πανό:"
-
 #~ msgid ""
 #~ "If checked, all chat and group chat windows will have the information "
 #~ "area in the top and the buttons area in the bottom hidden. You can quick "
diff --git a/po/en_GB.po b/po/en_GB.po
index 13e209a38..d168bfcd5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.13\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -16,59 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "A GTK+ Jabber client"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Join _Group Chat..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Add Contact..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Discover Services"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Execute Command..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Modify Account"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Open Gmail Inbox"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Personal Events"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Start Chat..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -78,23 +30,23 @@ msgstr ""
 "\n"
 "Please wait..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Please choose one of the options below:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 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/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Please select a server</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -102,57 +54,64 @@ msgstr ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anon_ymous authentication"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Connect when I press Finish"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Account Creation Wizard"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "I already have an account I want to _use"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "I want to _register for a new account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "If ticked, Gajim will remember the password for this account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Manage..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "None"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Save pass_word"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Set my profile when I connect"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Use custom hostname/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -160,147 +119,141 @@ msgstr ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Advanced"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Finish"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Hostname:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Miscellaneous</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personal Information</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "A_djust to status"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Account"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Account Modification"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Accounts"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Administration operations"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonymous authentication"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Auto-reconnect when connection is lost"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnect on Gajim startup"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Chan_ge Password"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Tick 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Choose _Key..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Click to change account's password"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Click to request authorisation to all contacts of another account"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Co_nnect on Gajim startup"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Connection"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Edit Personal Information..."
+#: ../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 "First Name:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "General"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Hostname: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -308,8 +261,11 @@ msgstr ""
 "If ticked, Gajim will also broadcast some more IPs except from just your IP, "
 "so file transfer has higher chances of working."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -317,16 +273,7 @@ msgstr ""
 "If ticked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"If ticked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -334,8 +281,7 @@ msgstr ""
 "If ticked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -345,47 +291,49 @@ msgstr ""
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Information about you, as stored in the server"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Surname:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Mer_ge accounts"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "No key selected"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "None"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Personal Information"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_ty:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -395,22 +343,20 @@ msgstr ""
 "server when two or more clients are connected using the same account; The "
 "client with the highest priority gets the events"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Priority will change automatically according to your status."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Re_name"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Resour_ce:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -424,199 +370,89 @@ msgstr ""
 "account with resource 'Home' and 'Work' at the same time. The resource which "
 "has the highest priority will get the events. (see below)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Save _passphrase (insecure)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Save conversation _logs for all contacts"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Send _keep-alive packets"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronise account status with global status"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Synchronise contacts"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Use _SSL (legacy)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Use file transfer proxies"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Adjust to status"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Name:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "A_djust to status"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Accounts"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anonymous authentication"
-
-#: ../data/glade/accounts_window.glade.h:13
-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."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Co_nnect on Gajim startup"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "First Name:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "If ticked, Gajim will get the password from a GPG agent like seahorse"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Surname:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Mer_ge accounts"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Re_name"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Send _keep-alive packets"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Synchroni_se account status with global status"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Synchronise contacts"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Use G_PG Agent"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Use cust_om hostname/port"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Use cust_om port:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Use file transfer proxies"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Edit Personal Information..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Enable"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Hostname: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Manage..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port: "
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Warn before using an insecure connection"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_use HTTP__PROXY environment variable"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "A_ccount:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Add New Contact"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -628,7 +464,7 @@ msgstr ""
 "protocol. Click on register button to\n"
 "proceed."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -636,407 +472,464 @@ msgstr ""
 "You must be connected to the transport to be able\n"
 "to add a contact from this protocol."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Group:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protocol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Register"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>An error has occurred:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Choose command to execute:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc Commands - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Check once more"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Error description..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Please wait while retrieving command list..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Please wait while the command is sending..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Please wait..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "This jabber entity does not expose any commands."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Description</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Advanced Configuration Editor"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Delete MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Deletes Message of the Day"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Edit _Privacy Lists..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sends a message to users currently connected to this server"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Set MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Sets Message of the Day"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Show _XML Console"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Update MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Updates Message of the Day"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Send Server Message..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Actions</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Conditions</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sounds</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Advanced Actions"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Advanced Notifications Control"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "All statuses"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Away"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Busy "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Launch a command"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Not Available"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "One or more special statuses..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Online / Free For Chat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Play a sound"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Disable auto opening chat window"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Disable existing pop-up window"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Disable existing sound for this event"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Disable showing event in roster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Disable showing event in systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Inform me with a pop-up window"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Open chat window with user"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Show event in roster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Show event in systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "and I "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "for "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entry:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Feed name:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Last modified:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "New entry received"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "You have received new entry:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blocked Contacts"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Message:</b> "
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Set Activity"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Set an activity"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Message:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Mood:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Change Password"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Enter it again for confirmation:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Enter new password:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Activity:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Mood:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Preset messages:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Save as Preset..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Join _Group Chat"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Add to Roster..."
+#: ../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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Copy JID/E-mail Address"
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Copy Link Location"
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Open E-mail Composer"
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Send"
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Start Chat"
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "In_vite"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Invite Friends!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "MUC server"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Please select a MUC server."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1044,187 +937,185 @@ msgstr ""
 "You are going to begin a Multi-User Chat.\n"
 "Select the contacts you want to invite"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Add Special _Notification..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Assign Open_PGP Key..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "E_xecute Command..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Edit _Groups..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "In_vite to"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Invite _Contacts"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "Remo_ve"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Send Cus_tom Status"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Send Single _Message..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Send _File..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Set Custom _Avatar..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Start _Chat"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Toggle End to End Encryption"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Toggle Open_PGP Encryption"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Add to Roster..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Allow him/her to see my status"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Block"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Forbid him/her to see my status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_History"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignore"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Manage Contact"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Rename..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Subscription"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Unblock"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Unignore"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Fill in the form."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Room Configuration"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Edit Groups"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESession</b> info)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Verify"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Features"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Cancel file transfer"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Cancels the selected file transfer"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Clean _up"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "File Transfers"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Hides the window"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Remove file transfer from the list."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1232,75 +1123,74 @@ msgstr ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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 "
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Continue"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notify me when a file transfer is complete"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Open Containing Folder"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "file transfers list"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Chatstate Tab Colours</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Account"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Bold"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Composing"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Contact"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Font style:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajim Themes Customisation"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Gone"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Group"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactive"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Italic"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1308,7 +1198,7 @@ msgstr ""
 "MUC\n"
 "Messages"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1316,109 +1206,73 @@ msgstr ""
 "MUC Directed\n"
 "Messages"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Paused"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Text _colour:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Text _font:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Background:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Change _Nickname..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Change _Subject..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Configure _Room..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Bookmark"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Destroy Room"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Manage Room"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimise on close"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Occupant Actions"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Send _File"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Add to Roster"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Ban"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Kick"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Member"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Owner"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Send Private Message"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Voice"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Create new post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "From"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Subject"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1428,25 +1282,19 @@ msgstr ""
 "If you plan to do massive deletions, please make sure Gajim is not running. "
 "Generally avoid deletions with contacts you currently chat with."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Delete"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Export"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim History Logs Manager"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1460,401 +1308,419 @@ msgstr ""
 "Use this program to delete or export logs. You can select logs from the left "
 "and/or search database from below."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Search Database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Contact name"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Groupchats"
+
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Search:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Log conversation history"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Bookmark this room"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Browse"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Join Group Chat"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Nickname:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Password:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Recently:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Room:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Bookmark this room"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Join"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Manage Accounts"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Auto join"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Manage Bookmarks"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimise on Auto Join"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Print status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Title:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "PEP Service Configuration"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Configure"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Properties</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Settings</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Manage Proxy Profiles"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Proxy _Host:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Proxy _Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Use HTTP prox_y"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Use proxy auth_entication"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Name:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Type:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Username:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Add this contact to roster (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Bookmark this room (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Browse the chat history (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Change the room's subject (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Change your nickname (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Invite contacts to the conversation (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Send a file (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Show a list of emoticons (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Show a list of formattings"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Show a menu of advanced functions (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Show the contact's profile (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Send"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Advanced Configuration Editor</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Applications</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Actions</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Auto Status</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Chat Appearance</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Chat Line Colours</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Chat state notifications</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Conditions</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Custom</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Font</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail Options</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Preset Status Messages</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Privacy</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Roster Appearance</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Status Messages</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Themes</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Middle:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visual Notifications</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Advanced"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Advanced..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "All statuses"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Allow _OS information to be sent"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Allow _OS information to be sent"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Allow sound when I'm _busy"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Away"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Always use OS/X default applications"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Always use OS/X default applications"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Always use OS/X default applications"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Ask status message when I:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "C_onnect on Gajim startup"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Chat message:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Check on startup if Gajim is the _default Jabber client"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Composing"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Configure colour and font of the interface"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Chat message:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Contact name"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Custom"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
 msgstr ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Disabled"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Display _activity of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Display _extra e-mail details"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Display m_ood of contacts in roster"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Display _tunes of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Display a_vatars of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Display m_ood of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Display status _messages of contacts in roster"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1864,7 +1730,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "display in chat windows."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1874,7 +1740,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1882,11 +1748,11 @@ msgstr ""
 "Gajim will notify you via a pop-up window in the bottom right of the screen "
 "about contacts that just signed out"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Hide all buttons in chat windows"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1894,7 +1760,7 @@ msgstr ""
 "If ticked, Gajim will allow others to detect the operation system you are "
 "using"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1902,13 +1768,13 @@ msgstr ""
 "If ticked, Gajim will also include information about the sender of the new e-"
 "mails"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "If ticked, Gajim will change status to Away when the computer is unused."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1916,7 +1782,7 @@ msgstr ""
 "If ticked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1924,7 +1790,7 @@ msgstr ""
 "If ticked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1932,25 +1798,32 @@ msgstr ""
 "If ticked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the activity of contacts in the roster window"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../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 mood of contacts in the roster window"
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the mood of contacts in the roster window"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "If ticked, Gajim will display the tunes of contacts in the roster window"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1960,7 +1833,7 @@ msgstr ""
 "windows. If no language is explicitly set via right click on the input "
 "field, the default language will be used for this contact or group chat."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1970,7 +1843,7 @@ msgstr ""
 "with caution, because it blocks all messages from any contact that is not in "
 "the roster"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -1980,7 +1853,7 @@ msgstr ""
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1988,7 +1861,7 @@ msgstr ""
 "If ticked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -1998,7 +1871,7 @@ msgstr ""
 "from MSN will have the equivalent MSN icon for status online, away, busy, "
 "etc...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2006,7 +1879,7 @@ msgstr ""
 "If enabled, Gajim will not ask for a status message. The specified default "
 "message will be used instead."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2014,79 +1887,102 @@ msgstr ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Log _encrypted chat session"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Ma_ke message windows compact"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Ma_nage..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Never\n"
-"Only when pending events\n"
-"Always"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Never"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Notify me about contacts that sign _in"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Notify me about contacts that sign _out"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notify me about it"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Notify on new _GMail email"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Never\n"
+"Only when pending events\n"
+"Always"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Personal Events"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Play _sounds"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Pop it up"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Show only in _roster"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Show systray:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Sign _in"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Sign _out"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2094,27 +1990,27 @@ msgstr ""
 "Some messages may include rich content (formatting, colours etc). If ticked, "
 "Gajim will just display the raw message text."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Sort contacts by status"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Status _iconset:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Style"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "T_heme:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2126,7 +2022,7 @@ msgstr ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2138,366 +2034,381 @@ msgstr ""
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-not-available timeout"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Use _transports icons"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Use system _default"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "When new event is received:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Error message: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "B_efore nickname:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Away after:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Display chat state notifications:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelt words"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore events from contacts not in the roster"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignore rich content in incoming messages"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Log status changes of contacts"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "_Not available after:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Open..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Reset to Default Colours"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Send chat state notifications:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Status message:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "_URL highlight:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Window behaviour:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "in _group chats"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "in _roster"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutes"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privacy Lists:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Add / Edit a rule</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>List of rules</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privacy List</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Active for this session"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Active on each startup"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "All"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "All (including subscription)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Allow"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Deny"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Order:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Privacy List"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "all by subscription"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "all in the group"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"none\n"
-"both\n"
-"from\n"
-"to"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Both"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "From"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "one"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "two"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "to send me messages"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "to send me queries"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "to send me status"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "to view my status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Address</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Birthday:</b>"
 msgstr "<b>Birthday:</b>"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>City:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Company:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Country:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Department:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Family:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Full Name</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Given:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Homepage:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Middle:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Name:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Nickname:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Position:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefix:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Role:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>State:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Street:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffix:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "About"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Click to set your avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Personal Info"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Work"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Remove account _only from Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Remove account from Gajim and from _server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Remove"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2505,192 +2416,143 @@ msgstr ""
 "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
 "your roster."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../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/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Roster Item Exchange"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Add _Contact..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Fea_tures"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "File _Transfers"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Frequently Asked Questions (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Help online"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profile, A_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Show Only _Active Contacts"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Show Trans_ports"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Show _Offline Contacts"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Show _Roster"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Accounts"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Contents"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Help"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Preferences"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Quit"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "_Send Single Message..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_View"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Please wait while retrieving search form..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Search"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Add contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Search"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "G_o"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Address:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Register to"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "From:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Reply to this message"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Send message"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Send message and close window"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Subject:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "To:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Reply"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Send & Close"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_thorise"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2698,176 +2560,191 @@ msgstr ""
 "Deny authorisation from contact so he or she cannot know when you're "
 "connected"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Subscription Request"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Deny"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Select the account with which you want to synchronise"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronise : select contacts"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Mute Sounds"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Send Single _Message"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Show All Pending _Events"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Group Chat"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Ask:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Client:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Contact time:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Resource:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Subscription:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Comments"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Configured avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Contact"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Personal Information"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "More"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "User avatar:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Traffic</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Enable"
+#: ../data/gui/xml_console_window.ui.h:4
+msgid "Hide IN stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:5
+msgid "Hide IQ stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Message"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Presence"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modify Account..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Local jid:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Personal"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Resource:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "A GTK+ Jabber client"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Cancel confirmation"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Service sent malformed data"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Service changed the session identifier."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Service returned an error."
 
@@ -2892,7 +2769,7 @@ msgstr "Integer"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Colour"
 
@@ -3029,85 +2906,85 @@ msgstr "Swedish"
 msgid "Chinese (Ch)"
 msgstr "Chinese (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Spelling language"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "A connection is not available"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Underline"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Strike"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Clear formating"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Really send file?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG encryption enabled"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Not in Roster"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "This contact does not support file transfer."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "No GPG key assigned"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3115,50 +2992,50 @@ msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG encryption disabled"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Session WILL be logged"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Session WILL NOT be logged"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "is"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "is NOT"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "will"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "will NOT"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "and authenticated"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3167,23 +3044,23 @@ msgstr ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Session negotiation cancelled"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "This session is encrypted"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " and WILL be logged"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " and WILL NOT be logged"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3191,25 +3068,25 @@ msgstr ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E encryption disabled"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "The following message was NOT encrypted"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3217,15 +3094,15 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Database Error"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3234,110 +3111,120 @@ msgstr ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
 "history will be lost)."
 
-#: ../src/chat_control.py:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s is now %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "creating logs database"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Change status information"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Change status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Set the presence type and description"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Free for chat"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Extended away"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Offline - disconnect"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Presence description:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "The status has been changed."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Leave Groupchats"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "You have not joined a groupchat."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Groupchats"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "You left the following groupchats:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Forward unread messages"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "All unread messages have been forwarded."
 
@@ -3428,9 +3315,9 @@ msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "default"
 
@@ -3711,11 +3598,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:228
+#: ../src/common/config.py:229
 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:229
+#: ../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."
@@ -3723,7 +3610,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:230
+#: ../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."
@@ -3731,7 +3618,7 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3745,29 +3632,29 @@ msgstr ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3777,7 +3664,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3788,7 +3675,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3808,31 +3695,31 @@ msgstr ""
 "'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
 "specific window."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Hides the buttons in chat windows."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Hides the banner in a group chat window"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 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:251
+#: ../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."
@@ -3840,15 +3727,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Smooth scroll message in conversation window"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3856,11 +3743,11 @@ msgstr ""
 "List of colours, separated by \":\", that will be used to colour nicknames "
 "in group chats."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3868,7 +3755,7 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3876,7 +3763,7 @@ msgstr ""
 "Should we show the confirm block contact dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3884,7 +3771,7 @@ msgstr ""
 "Should we show the confirm custom status dialogue or not? Empty string means "
 "we never show the dialogue."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3894,7 +3781,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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3902,7 +3789,7 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3910,7 +3797,7 @@ msgstr ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3918,7 +3805,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3926,7 +3813,7 @@ msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3934,7 +3821,7 @@ msgstr ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3942,11 +3829,11 @@ msgstr ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Time of inactivity needed before the change status window closes down."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3954,7 +3841,7 @@ msgstr ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3962,11 +3849,11 @@ msgstr ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Choose interval between 2 checks of idleness."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3974,7 +3861,7 @@ msgstr ""
 "Change the value to change the size of latex formulae displayed. The higher "
 "is larger."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -3982,7 +3869,7 @@ 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:272
+#: ../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!"
@@ -3990,11 +3877,11 @@ 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:273
+#: ../src/common/config.py:274
 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:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4002,7 +3889,23 @@ msgstr ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4010,7 +3913,7 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4018,37 +3921,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:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "If enabled, restore the last status that was used."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "If True, Contacts requesting authorisation will be automatically accepted."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 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:301
+#: ../src/common/config.py:311
 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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Enable ESessions encryption for this account."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Should Gajim automatically start an encrypted session when possible?"
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4056,29 +3959,36 @@ msgstr ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Show a warning dialogue before sending password on an plaintext connection."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Show a warning dialogue before using standard SSL library."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Show a warning dialogue before sending password on an plaintext connection."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Space separated list of SSL errors to ignore."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Whitespace sent after inactivity"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sent after inactivity"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4087,11 +3997,11 @@ msgstr ""
 "to reconnect."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4099,15 +4009,15 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Answer to receipt requests"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Sent receipt requests"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4115,11 +4025,16 @@ msgstr ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4127,101 +4042,101 @@ msgstr ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' or ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4229,97 +4144,89 @@ 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:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Wrong host"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Invalid local address? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../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:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registration succeeded"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registration with agent %s succeeded"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Registration failed"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, 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:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Invisibility not supported"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Account %s doesn't support invisibility."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 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:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4328,7 +4235,7 @@ 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:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
@@ -4336,76 +4243,76 @@ msgstr "Nickname not allowed: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Maximum number of users for %s has been reached"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "You are banned from group chat %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Group chat %s does not exist."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Your registered nickname must be used in group chat %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "You are not in the members list in groupchat %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Room has been destroyed"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "You can join this room instead: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4542,27 +4449,27 @@ msgstr "Key usage does not include certificate signing"
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 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:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[This message is *encrypted* (See :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4571,76 +4478,76 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s provided a different registration form"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Unknown SSL error: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server replied: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Connection to proxy failed"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Could not connect to account %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, 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:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4649,7 +4556,7 @@ msgstr ""
 "\n"
 "SSL Error: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4658,24 +4565,24 @@ msgstr ""
 "\n"
 "Unknown SSL error: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4684,43 +4591,43 @@ 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sent contact: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Sent contacts:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Unregister failed"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Unregistration with server %(server)s failed: %(error)s"
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Observers"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Not in roster"
 
@@ -4729,36 +4636,52 @@ msgstr "Not in roster"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus does not run correctly on this machine"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, 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"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Database cannot be read."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 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:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
+"Try reading %(url)s"
+msgstr ""
+"Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
@@ -4926,240 +4849,277 @@ msgstr "End of week"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Invalid character in username."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Server address required."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Invalid character in hostname."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Busy"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Busy"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Not Available"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Free for Chat"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Free for Chat"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Available"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Available"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Connecting"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "A_way"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Unknown"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Has errors"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "To"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Both"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "None"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " from room %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " from user %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " from %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, 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:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Room Configuration"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+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"
@@ -5169,17 +5129,74 @@ msgstr "Error executing \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s is not a valid loglevel"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Default Message"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Size: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -5816,19 +5833,19 @@ msgstr "Studying"
 msgid "Writing"
 msgstr "Writing"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Unknown Artist"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Unknown Title"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Unknown Source"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5838,12 +5855,12 @@ msgstr ""
 "from <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5852,7 +5869,7 @@ msgstr ""
 "cancelled."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5922,24 +5939,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Disabled"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Default Message"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Enabled"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5948,68 +5961,68 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is not usable on this computer"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6017,143 +6030,143 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Rename Account"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enter a new name for account %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 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:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "There is no OpenPGP secret key available."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "To disable the account, you must be disconnected."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6161,11 +6174,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6173,11 +6186,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6185,11 +6198,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6197,7 +6210,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6213,86 +6226,114 @@ msgstr ""
 "4. domain (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Removing %s account"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Emoticons disabled"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Connection to proxy failed"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "What do you want to do?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Remove account _only from Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 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:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Invalid nickname"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Character not allowed"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Invalid server"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Invalid room"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6302,32 +6343,32 @@ msgstr ""
 "later by choosing the Accounts menu item under the Edit menu from the main "
 "window."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 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:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Certificate Already in File"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6342,7 +6383,7 @@ msgstr ""
 "SSL Error: %(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6353,59 +6394,59 @@ msgstr ""
 "SHA1 fingerprint of the certificate:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Next Message Received Focused"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Next Message Received Unfocused"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
@@ -6427,44 +6468,44 @@ msgstr ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Quote"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6472,7 +6513,7 @@ msgstr[0] "Yesterday"
 msgstr[1] "Yesterday"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
@@ -6577,71 +6618,71 @@ msgstr "Yahoo! Address:"
 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "You cannot add yourself to your roster."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6654,101 +6695,101 @@ msgstr ""
 "\n"
 "Highlighting misspelt words feature will not be used"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "The nickname has not allowed characters."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Invalid Account"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Invalid Nickname"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, 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:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Without a connection, you can not synchronise your contacts."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "This account is not connected to the server"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Synchronise"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6757,173 +6798,171 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Sad"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Modify"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "Remo_ve"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6931,151 +6970,151 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Add"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Modify"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Delete"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Groups"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Add contact"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Removes contact from roster"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Order: %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edit a rule</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Add a rule</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privacy Lists for %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Privacy Lists"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Invalid List Name"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 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:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "You are invited to a groupchat"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact has invited you to join a discussion"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Comment: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Do you want to accept the invitation?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7086,19 +7125,19 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "You have already verified this contact's identity."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Contact's identity verified"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Verify again..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7108,19 +7147,19 @@ msgstr ""
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Contact's identity NOT verified"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Verify..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Have you verified the contact's identity?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7135,22 +7174,22 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 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:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7158,7 +7197,7 @@ msgstr ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7166,52 +7205,52 @@ msgstr ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7219,93 +7258,97 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Invalid Server Name"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Browsing %(address)s using account %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Execute Command"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanning %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Bookmark"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "New post"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Subscribe"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
@@ -7354,7 +7397,7 @@ msgstr "Requires python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Feature not available under Windows."
 
@@ -7518,102 +7561,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Requires python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Banners and clickable links"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr "Ability to have clickable URLs in chat and groupchat window banners."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Requires python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Requires python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Feature"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Time"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Open Containing Folder"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "File transfer stopped"
 
@@ -7621,7 +7652,7 @@ msgstr "File transfer stopped"
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Description: "
 
@@ -7653,12 +7684,12 @@ msgstr "Description: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../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."
@@ -7666,22 +7697,22 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
@@ -7717,71 +7748,56 @@ msgstr "File: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Continue"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importing PyGTK failed: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim needs PyGTK 2.12 or above"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim needs GTK 2.12 or above"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim needs GTK 2.12 or above to run. Quiting..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ runtime is missing libglade support"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim needs PySQLite2 to run"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim needs pywin32 to run"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7791,11 +7807,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7838,8 +7854,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "account"
 
@@ -7861,12 +7877,15 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, 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 "
 
 #: ../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:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "message"
 
@@ -8096,70 +8115,89 @@ msgstr ""
 "all accounts"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI to handle"
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Message content"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Room JID"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Nickname to use"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Password to enter the room"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Check if Gajim is running"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Shows or hides the ipython window"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8168,15 +8206,15 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "It seems Gajim is not running. So you can't use gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8185,16 +8223,16 @@ msgstr ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8203,7 +8241,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8212,7 +8250,7 @@ msgstr ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8221,7 +8259,11 @@ msgstr ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Wrong uri"
 
@@ -8250,175 +8292,176 @@ msgstr "You cannot delete your current theme"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Conversation with "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Continued conversation"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Any occupant is allowed to see your full JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Room logging is enabled"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "A new room has been created"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "affiliation changed"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "room configuration changed to members-only"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "system shutdown"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s has left"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s has joined the group chat"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 is now %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "Do _not ask me again"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Changing Subject"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Please specify the new subject:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Changing Nickname"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Please specify the new nickname you want to use:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Destroying %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8426,22 +8469,22 @@ msgstr ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "You may also enter an alternate venue:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Kicking %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "You may specify a reason below:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Banning %s"
@@ -8462,58 +8505,58 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Report Bug"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: cannot open %s for reading"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Error reading file:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim is not the default Jabber client"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 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:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Extension not supported"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Save Image as..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8524,58 +8567,58 @@ msgstr ""
 "occupant.\n"
 "Please specify another nickname below:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Always use this nickname when there is a conflict"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Do you accept this request on account %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Authorisation for %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Connection Failed"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error while sending %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Subscription request"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8583,59 +8626,59 @@ 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Unsubscribed"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, 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:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Room now shows unavailable member"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "room now does not show unavailable members"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Room logging is now enabled"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Room logging is now disabled"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Room is now non-anonymous"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Room is now semi-anonymous"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Room is now fully-anonymous"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
@@ -8643,23 +8686,23 @@ msgstr ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG Passphrase Incorrect"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG key not trusted"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8667,27 +8710,28 @@ msgstr ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8702,42 +8746,42 @@ msgstr ""
 "Subject: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Remote contact stopped transfer"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Error opening file"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8746,36 +8790,36 @@ msgstr ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Unable to decrypt message"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Error."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Resource Conflict"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8783,21 +8827,22 @@ msgstr ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Error verifying SSL certificate"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8808,15 +8853,15 @@ msgstr ""
 "(error)s\n"
 "Do you still want to connect to this server?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignore this error for this certificate."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "SSL certificate error"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8833,23 +8878,27 @@ msgstr ""
 "\n"
 "Do you still want to connect and update the fingerprint of the certificate?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Insecure connection"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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 unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Yes, I really want to connect insecurely"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -8857,21 +8906,30 @@ 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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"You are about to send your password on an unencrypted connection. Are you "
+"sure you want to do that?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "PEP node was not removed"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP node %(node)s was not removed: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Emoticons disabled"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8879,7 +8937,7 @@ msgstr ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 
-#: ../src/gui_interface.py:2570
+#: ../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 "
@@ -8889,40 +8947,40 @@ msgstr ""
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG key expired"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Your GPG key has expied, you will be connected to %s without OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Wrong Passphrase"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
@@ -8930,37 +8988,37 @@ msgstr "Please retype your GPG passphrase or press Cancel."
 msgid "_New Group Chat"
 msgstr "_New Group Chat"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "I would like to add you to my roster"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Cannot find history logs database"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Contacts"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Message"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -8968,7 +9026,7 @@ msgstr ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -8982,26 +9040,26 @@ msgstr ""
 "\n"
 "In case you click YES, please wait..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Exporting History Logs..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9040,35 +9098,35 @@ msgstr "Status is now: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status is now: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Timeout loading image"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Image is too big"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Messages"
 
@@ -9080,22 +9138,22 @@ msgstr "- messages will be logged"
 msgid "- messages will not be logged"
 msgstr "- messages will not be logged"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
@@ -9120,7 +9178,7 @@ msgstr "Messaged by %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "New Message from %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignore"
 
@@ -9128,18 +9186,18 @@ msgstr "Ignore"
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "File is empty"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "File does not exist"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Could not load image"
 
@@ -9171,51 +9229,51 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Merged accounts"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Now \"%s\" will know your status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG is not usable"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9223,27 +9281,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "desync'ed"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Really quit Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Are you sure you want to quit Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Always close Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Cancel file transfer"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9251,16 +9320,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:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "You must read them before removing this transport."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" will be removed"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9268,11 +9337,11 @@ msgstr ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transports will be removed"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9281,11 +9350,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "these transports: %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 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:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9294,56 +9363,56 @@ msgstr ""
 "send you."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Rename Contact"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enter a new nickname for contact %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Rename Group"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enter a new name for group %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Remove Group"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Assign OpenPGP Key"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Select a key to apply to the contact"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" will be removed from your roster"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9352,11 +9421,11 @@ msgstr ""
 "her always seeing you as offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Do you want to continue?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9364,16 +9433,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Contacts will be removed from your roster"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9382,34 +9451,35 @@ msgstr ""
 "By removing these contacts:%s\n"
 "you also remove authorisation resulting in them always seeing you as offline."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"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 they will see your global status."
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "No account available"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9417,13 +9487,13 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9433,23 +9503,23 @@ msgstr ""
 "is used when the same person has several Jabber accounts or transport "
 "accounts."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Invalid file URI:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s to %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Make %s and %s metacontacts"
@@ -9459,126 +9529,130 @@ msgstr "Make %s and %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "using account %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "to %s account"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "using %s account"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Manage Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "of account %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "for account %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Change Status Message"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Publish Tune"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Publish Tune"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Configure Services..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maximise All"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Send Group M_essage"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "To all users"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "To all online users"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Manage Contacts"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Edit _Groups"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Send Single Message"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Execute Command..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Manage Transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Modify Transport"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Rename"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maximise"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Reconnect"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Disconnect"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
@@ -9609,13 +9683,13 @@ msgid "Confirm these session options"
 msgstr "Confirm these session options"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
@@ -9638,116 +9712,126 @@ msgstr ""
 "\n"
 "Continue with the session?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "in _roster"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Resource: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [blocked]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimised]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Last status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Connected"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Disconnected"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Subscription: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Tune:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Notification"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Transferred: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Not started"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Stopped"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Completed"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "Paused"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Transferring"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "This service has not yet responded with detailed information"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9755,28 +9839,28 @@ msgstr ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "Unknown"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9784,7 +9868,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9792,13 +9876,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9806,18 +9890,372 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "There is no pending subscription request."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Join _Group Chat..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Add Contact..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Discover Services"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Execute Command..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Modify Account"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Personal Events"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Start Chat..."
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Account Modification"
+
+#~ 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 ""
+#~ "Tick 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"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Edit Personal Information..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Hostname: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "If ticked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+
+#~ msgid "Port: "
+#~ msgstr "Port: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Save _passphrase (insecure)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Send keep-alive packets"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Use _SSL (legacy)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Adjust to status"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Delete MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Send Server Message..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Join _Group Chat"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Copy JID/E-mail Address"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Copy Link Location"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Open E-mail Composer"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Open Link in Browser"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Start Chat"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Change _Nickname..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Change _Subject..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Configure _Room..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Destroy Room"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Manage Room"
+
+#~ msgid "Send _File"
+#~ msgstr "Send _File"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Add to Roster"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Send Private Message"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Manage Accounts"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Add this contact to roster (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Bookmark this room (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Browse the chat history (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Change the room's subject (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Change your nickname (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Invite contacts to the conversation (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Send a file (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Show a list of emoticons (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Show a list of formattings"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Show a menu of advanced functions (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Show the contact's profile (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Add _Contact..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Fea_tures"
+
+#~ msgid "File _Transfers"
+#~ msgstr "File _Transfers"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profile, A_vatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Accounts"
+
+#~ msgid "_Contents"
+#~ msgstr "_Contents"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Preferences"
+
+#~ msgid "_Quit"
+#~ msgstr "_Quit"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Send Single Message..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Send Single _Message"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Group Chat"
+
+#~ msgid "Enable"
+#~ msgstr "Enable"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modify Account..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Wrong host"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Invalid local address? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Banners and clickable links"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Ability to have clickable URLs in chat and groupchat window banners."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Requires python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ runtime is missing libglade support"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim needs PySQLite2 to run"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Incoming message:"
 
@@ -10049,12 +10487,6 @@ msgstr " resource with priority "
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim account %s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Always use OS/X default applications"
-
-#~ msgid "Custom"
-#~ msgstr "Custom"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Duplicate Jabber ID"
 
@@ -10187,9 +10619,6 @@ msgstr " resource with priority "
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo and Juliet</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Old stories"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquy"
 
@@ -10306,9 +10735,6 @@ msgstr " resource with priority "
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "Set status message to reflect currently playing _music track"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Show only in _roster"
-
 #~ msgid "The auto away status message"
 #~ msgstr "The auto away status message"
 
@@ -10339,18 +10765,9 @@ msgstr " resource with priority "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Advanced Notifications Control..."
 
-#~ msgid "_Never"
-#~ msgstr "_Never"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Notify me about it"
-
 #~ msgid "_Player:"
 #~ msgstr "_Player:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Pop it up"
-
 #~ msgid "City:"
 #~ msgstr "City:"
 
diff --git a/po/eo.po b/po/eo.po
index 5c99492a5..e47df890f 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.10.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -17,63 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+bazita jabber-kliento"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
-msgid "Join _Group Chat..."
-msgstr "Eniri en babilejon"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Aldoni kontakton..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Serĉi servojn"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Plenumi komandon..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Korekti konton"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Malfermi poŝtkeston de Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Persona detalaĵoj"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Ekparoli"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Stato"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -84,83 +32,90 @@ msgstr ""
 "\n"
 "Bonvolu atendi..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Bonvolu elekti unu el sekvaj opcioj:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Bonvolu plenigi datumon por via nova konto</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Uzi aŭtentokontrolon"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Konekti kiam vi premos Finigi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontkreilo"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Mi jam havas konton, mi volas uzi ĝin"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Mi volas registri novan konton"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Se markitas, Gajim memoros la pasvorton por tiu ĉi konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Administri..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Neniu"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Prokura servilo:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Konservi pasvorton"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Korekti vian personan informon kiam vi konektitos"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Uzi propran servilnomon/pordon"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -168,148 +123,145 @@ msgstr ""
 "Vi bezonas havi konton por ke konekti\n"
 "al la jaber-reto."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Krome"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Finigi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Servilnomo: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Pordo:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Servilo:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Cetero</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persona informo</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Agordo</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Alĝustigi laŭ stato"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Konta korektado"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Kontoj"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Estra listo"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Uzi aŭtentokontrolon"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Aŭtomate rekonekti kiam konekto rompiĝas"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_onekti dum lanĉo de Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Ŝanĝi _pasvorton"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Marku tion por ke Gajim konektos al pordo 5223 kie malnovaj serviloj atendas "
-"SSL-kapablajn konektojn. Rimarku ke Gajim defaŭlte uzas TLS-ĉifradon se la "
-"servilo subtenas ĝin, kaj tiu opcio malŝaltas TLS"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Elekti _ŝlosilon..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Klaku por ŝanĝi konta pasvorton"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "K_onekti dum lanĉo de Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Konekto"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Korekti personan informon..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Retpoŝtadreso:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Nomo:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Ĝenerala"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Servilnomo: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -317,8 +269,12 @@ msgstr ""
 "Se markitas, Gajim anoncos krom vian IP ankoraŭ kelkajn IP, do "
 "dosiertransmeto havos pli ŝancojn funkcii."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, 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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -326,23 +282,13 @@ msgstr ""
 "se markitas, Gajim sendados vivkontrolajn (keep-alive) pakaĵojn, tio "
 "preventas diskonekton pro longa neaktiva tempo"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Se markitas, Gajim konservos pasvorto en ~/.gajim/config kun legpermeso nur "
-"por vi."
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr "Se markitas, Gajim aŭtomate konektos per tiu konto dum lanĉo"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../data/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 "
@@ -351,47 +297,49 @@ 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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Informo pri vi, kiel estas en la servilo"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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-ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Familia nomo:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Unuigi kontojn"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Neniu ŝlosilo elektita"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Neniu"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Persona informo"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Pordo: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_tato:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -401,22 +349,20 @@ msgstr ""
 "servilo, kiam kelkaj klientoj estas konekta per sama konto. La kliento kun "
 "la plej granda prioritato ricevas eventojn"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritato ŝanĝiĝos aŭtomate laŭ via stato."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Prokura servilo:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Re_nomigi"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Risur_cnomo:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -429,212 +375,99 @@ msgstr ""
 "\"Hejmo\" kaj \"Laborejo\". La kliento, kiu havas la plej altan prioritaton, "
 "ricevos la eventojn."
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Konservi pas_frazon (malsekure)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Konservi komunikadajn _protokolojn por ĉiuj kontaktoj"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Sendi vivkontrolajn pakaĵojn"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Sink_ronigi kontan staton kun komuna stato"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Montri _senkonektajn kontaktojn"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Uzi _SSL (malnovan)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Uzi dosiertransmetan prokuran servilon"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Alĝustigi laŭ stato"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Nomo:"
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Agordo</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "_Alĝustigi laŭ stato"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Kontoj"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Uzi aŭtentokontrolon"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "K_onekti dum lanĉo de Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Retpoŝtadreso:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Nomo:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, 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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Familia nomo:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Unuigi kontojn"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Re_nomigi"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Sendi vivkontrolajn pakaĵojn"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Sink_ronigi kontan staton kun komuna stato"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Montri _senkonektajn kontaktojn"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Uzi propran servilnomon/pordon"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Uzi propran pordon:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Uzi dosiertransmetan prokuran servilon"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Korekti personan informon..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Ebligi"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Servilnomo: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Administri..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Pordo:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "K_onto:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Aldoni novan kontakton"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -646,7 +479,7 @@ msgstr ""
 "protokolo. Klaku la butonon \"Registri\"\n"
 "por fari tion."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -654,629 +487,683 @@ msgstr ""
 "Vi devas konekti al la transportilo por ebligi aldonon\n"
 "de kontakto per tiu protokolo."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "Kaŝ_nomo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokolo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "Re_gistri"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
 msgid "Error description..."
 msgstr "Priskribo"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr ""
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Priskribo</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Detala agorda administrilo"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtrilo:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Forigi tagmesaĝon"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Forigas mesaĝon de la tago"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Privataj listoj"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sendas mesaĝon al uzuloj nuntempe konektitaj al tiu ĉi servilo"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Enigi tagmesaĝon"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Instalas mesaĝon de la tago"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Montri _XML-konzolon"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Renovigi tagmesaĝon"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Renovigas mesaĝon de la tago"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administristo"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Sendi servilan mesaĝon"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Agoj</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Kondiĉoj</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sonoj</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Kromaj agoj"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Kroma agordo de avizado"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "ia ajn stato"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Fora"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Okupata "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Nevidebla"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Lanĉi komandon"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Nedisponebla"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "kelka(j) speciala(j) stato(j)..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Enrete / Babilema"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Ludi sonon"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Mesaĝo venas\n"
-"Kontakto senkonektas\n"
-"Kontakto ŝanĝas staton\n"
-"Emfazita babileja mesaĝo\n"
-"Babileja mesaĝo venas\n"
-"Dosiertransmeta peto\n"
-"Dosiertransmeto komencis\n"
-"Dosiertransmeto finis"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/gui/advanced_notifications_window.ui.h:25
+#, fuzzy
+msgid "Receive a Message"
+msgstr "Nova privata mesaĝo"
+
+#: ../data/gui/advanced_notifications_window.ui.h:26
 msgid "When "
 msgstr "Kiam "
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 "_Aktivigi fenestragordilan urgkonsileton \"UrgencyHint\" por briligi "
 "interparolan fenestron en taskostrio"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Malŝaltas aŭtomatan malfermadon de interparola fenestro"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Malŝalti ekzistan ŝprucfenestron"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../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/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Malŝalti eventmontron en kontaktlisto"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Malŝalti montron de evento en taskopleto"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informi min per ŝprucfenestro"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "Malfermi interparolan _fenestron por uzulo"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "Montri eventon en _kontaktlisto"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "Montri eventon en _taskopleto"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "kaj mi "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "Kontaktoj"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
-"kontakto(j)\n"
-"grupo(j)\n"
-"ĉiuj"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "por "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
 msgstr "Lando:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "Etosa nomo"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
 msgid "Last modified:"
 msgstr "Familia nomo:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "Kiam ricevas novan eventon"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "Kontaktoj"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Sonoj</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Ŝanĝi pasvorton"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Enigi ĝin denove por konfirmi:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Enigu novan pasvorton:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Ŝaltita"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Babilejo:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Antaŭpreparitaj mesaĝoj:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Konservi kiel antaŭpreparitaj..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Eniri en babilejon"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "n°"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Aldoni al kontaktlisto"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopii JID/retpoŝtan adreson"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopii ligilan lokon"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Malfermi retpoŝtredaktilon"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Malfermi ligilon per retrigardilo"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Ekparoli"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Sendi"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "In_viti al"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "Rigardiloj"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "Peti por vidi lian/ŝian staton"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "Aligi specialan _avizon"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "Enigi Open_PGP-ŝlosilon"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Plenumi komandon..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Aranĝi _Grupojn"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "In_viti al"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kontaktoj"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Forigi"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sendi propran XML"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Sendi unuopan _mesaĝon..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "Sendi _dosieron"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Ekparoli"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Baskuli Open_PGP-ĉifradon"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Baskuli Open_PGP-ĉifradon"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Aldoni al kontaktlisto"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Permesi al li/ŝi vidi vian staton"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Malpermesi al li/ŝi vidi vian staton"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historio"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "Renomigado de kontakto"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Renomigi"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Abono"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "naŭ"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Plenigu la formon."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Agordo de babilejo"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Aranĝi grupojn"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Priskribo</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Servilaj trajtoj"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Nuligi dosiertransmeton"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Nuligas la indikitan dosiertransmeton"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Malplenigi"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Dosieraj transmetoj"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Kaŝas la fenestron"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Forigi dosiertransmeton el la listo."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1284,75 +1171,74 @@ msgstr ""
 "Tiu ĉi ago forigas unu dosiertransmeton de la listo. Se la transmeto estas "
 "aktiva, ĝin unue haltitas kaj poste forigitos."
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Daŭrigi"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Avizi min kiam dosiero estas transdonita"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Malfermi enhavantan dosierujon"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Paŭzi"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "dosiertransdonada listo"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Koloroj de babilstataj langetoj</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Konta linio\n"
-"Grupa linio\n"
-"Kontakta linio\n"
-"Rubando"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Konto"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Dika"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../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"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakto"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Tipara fasono:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Etosa administrado de Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Foriris"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktiva"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Kursiva"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1360,7 +1246,7 @@ msgstr ""
 "Babilejaj\n"
 "Mesaĝoj"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1368,116 +1254,75 @@ msgstr ""
 "Babilejaj\n"
 "mesaĝoj al vi"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Paŭzas"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Teksta _koloro:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Teksta _tiparo:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Fono:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "Ŝanĝi kaŝ_nomon"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "Ŝanĝi _temon"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "Administri _babilejon"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Starigi legosignon por tiu babilejo"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Aranĝi legosignojn"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derigisto"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Agoj por babilanto"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Sendi _dosieron"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Aldoni al kontaktlisto"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Estro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Malpermesi"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Elpeli"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Mastro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Sendi privatan mesaĝon"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Voĉo"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
 msgid "Create new post"
 msgstr "Nova mesaĝo"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Temo"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1493,26 +1338,20 @@ msgstr ""
 "Ĝenerale evitu forigojn rilatajn al kontaktoj kun kiu vi interparolas "
 "nuntempe."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Forigi"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Eksportado"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim administrilo de protokoloj"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1521,425 +1360,439 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Serĉi datumbaze"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Kontaktnomo"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Babilejoj"
+
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Serĉi"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Protokoli komunikadan historion"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "Starigi legosignon por tiu babilejo"
+msgid "Bro_wse Rooms"
+msgstr "_Rigardi"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Eniri babilejen"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Kaŝnomo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Pasvorto:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Antaŭ nelonge:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Babilejo:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Servilo:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Starigi legosignon por tiu babilejo"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Aliĝi"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Administri kontojn"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Aŭtomate aliĝi"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Aranĝi legosignojn"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Eligi statojn:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Servilo:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Agordo de babilejo"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Daŭrigi"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "Forigi"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Agordo</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Agordo</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr ""
 "HTTP Connect\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Administri prokurservilajn agordojn"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Pas_vorto:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Prokura servilo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Pordo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Uzi aŭtentokontrolon"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "_URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Nomo:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Salutnomo:"
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Aligas kontakton en kontaktliston"
-
-#: ../data/glade/message_window.glade.h:2
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Starigi legosignon por tiu babilejo"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Ŝanĝi kaŝ_nomon"
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "atentas al la komunikado"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Klaku por enigi mienon (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Klaku por enigi mienon (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Klaku por enigi mienon (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Sendi"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Pasfrazo"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Detala agorda administrilo</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Programoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Agoj</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Agoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Koloroj de babilstataj langetoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Bildavizoj</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Kondiĉoj</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Propraj</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Sonoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Agordo por GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<i>Privataj listoj</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Antaŭpreparitaj statmesaĝoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Agordo</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Aldoni regulon</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Bildavizoj</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Krome"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Krome"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"pri ĉiuj babilstatoj\n"
-"nur pri tajpado\n"
-"neniam"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "ia ajn stato"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Ebligi sendi informon pri _OS"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Ebligi sendi informon pri _OS"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Fora"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Demandi statmesaĝon kiam mi:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"Aŭtodetekti dum ĉiu Gajim lanĉo\n"
-"Ĉiam uzi defaŭlton de GNOME\n"
-"Ĉiam uzi defaŭlton de KDE\n"
-"Ĉiam uzi defaŭlton de Xfce\n"
-"Propraj"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "K_onekti dum lanĉo de Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Ĉiam kontroli ĉu Gajim estas _defaŭlta jabber-kliento dum lanĉo"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Tajpas mesaĝon"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Agordo de koloro kaj tiparo de la fasado"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontaktnomo"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Propraj</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "malŝaltitaj"
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Montri _kromajn detalojn pri retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Montri kaŝ_bildetojn de kontaktojn en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Montri stat_mesaĝojn de kontaktoj en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1949,7 +1802,7 @@ msgstr ""
 "povas havi kun kontakto. Tie ĉi vi povas specifi kiujn babilstatojn vi volas "
 "montri en interparolaj fenestroj."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1959,7 +1812,7 @@ msgstr ""
 "Tie ĉi vi povas specifi pri kiuj babilstatoj vi volas mesaĝi al "
 "interparolanto."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1967,36 +1820,36 @@ msgstr ""
 "Gajim avizos vin per ŝprucfenestro en la malsupra dekstra angulo de la "
 "ekrano pri kontaktoj kiu ĵus elsalutis"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se markitas, Gajim aliĝos al tiu ĉi babilejo dum lanĉo"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2004,7 +1857,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -2012,7 +1865,7 @@ msgstr ""
 "Se markitas, Gajim montros statmesaĝojn de kontaktoj sub la kontaktnomo en "
 "la kontaktlisto kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2020,7 +1873,15 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2028,7 +1889,7 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2036,14 +1897,14 @@ msgstr ""
 "Se markitas, Gajim montros kaŝbildetojn de kontaktoj en kontaktlista "
 "fenestro kaj en babilejoj"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2054,21 +1915,21 @@ msgstr ""
 "singarde, ĉar tio blokas ĉiujn mesaĝojn de ĉiuj kontaktoj kiuj mankas en via "
 "kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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 "Se markita, Gajim informos ankaŭ pri sendanto de la novaj retleteroj"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2078,13 +1939,13 @@ msgstr ""
 "kontakto el MSN havos ekvivalentajn piktogramojn de MSN por statoj konekta, "
 "fora, okupata ktp...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2092,79 +1953,104 @@ msgstr ""
 "Se ne malŝaltita, Gajim anstataŭigas ASCII mienojn, kiel \":)\", per "
 "ekvivalentaj animaciataj aŭ statikaj grafikaj mienoj"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "_Unu mesaĝfenestro:"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Admi_nistri..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Neniam"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Konta korektado"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Avizi min pri kontaktoj kiuj: "
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Avizi min pri tio"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Avizi pri novaj _Gmail-leteroj"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Persona detalaĵoj"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Ludi _sonojn"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Antaŭigi la fenestron"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Agordo"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servilo:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Montri nur en _kontaktlisto"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "Montri eventon en _taskopleto"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "E_nsalutas"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "E_lsalutas"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2172,30 +2058,30 @@ msgstr ""
 "Iuj mesaĝoj povas enteni tekstatributojn (aranĝo, koloro k.t.p.). Se "
 "markitas, Gajim simple montros krudan mesaĝan tekston."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Ordigi kontaktojn per stato"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Defaŭlta stata p_iktogramaro:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "Malrapidas"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Etoso:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2203,7 +2089,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2211,787 +2097,763 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Uzi _transportilajn piktogramarojn"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Uzi sisteman defaŭlton"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Kiam ricevas novan eventon"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Erara mesaĝo: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Antaŭ kaŝnomo:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "Aŭtomate _fora post:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Rigardilo:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Montrataj babilstataj _avizoj:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Mienoj:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Dosieradministrilo:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Emfazi misskribajn vortojn"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignori eventojn de kontaktoj kiuj mankas en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignori formatadon en venantaj mesaĝoj"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Protokoli statŝanĝojn de kontaktoj"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "Ret_poŝtkliento:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Aŭtomate nedisponebla post:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Malfermi..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Reŝargi kolorojn per defaŭlto"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Montrataj babilstataj _avizoj:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Statmesaĝo:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "Eniri en babilejon"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutoj"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privataj listoj:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Aldoni / Redakti regulon</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Listo de reguloj</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privataj listoj</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktiva dum la kuranta seanco"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktiva dum ĉiu lanĉo"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Ĉiuj"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "ĉiuj laŭ abonado"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permesi"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Rifuzi"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "Jabber-ID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Ordnumero:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Privata listo"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "ĉiuj laŭ abonado"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "ĉiuj en la grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"neniu\n"
-"ambaŭ\n"
-"de\n"
-"al"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Ambaŭ"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "De"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "unu"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "du"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "sendi mesaĝojn al mi"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "sendi informmendojn al mi"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "sendi staton al mi"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "vidi mian staton"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "Kaŝbildeto:"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Birthday:</b>"
 msgstr "Naskiĝtago:"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Propraj</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../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/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Sonoj</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Fako:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "Retpoŝtadreso:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Kroma adreso:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familia nomo:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Propraj</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Hejmpaĝo:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Propraj</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Kaŝnomo:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefono:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Kondiĉoj</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Poŝtkodo:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Agordo</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Sonoj</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Agordo</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Agordo</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sonoj</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Pri si"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Klaku por starigi vian kaŝbildon"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Persona informo"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Laboro"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Kion vi volas fari?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Forigi konton _nur el Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Forigi konton el Gajim kaj el _servilo"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Forigi"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_O kej"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Forigi"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Aldoni kontakton..."
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Servilaj trajtoj"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Dosieraj _transmetoj"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Oftaj demandoj (rete)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Helpo reta"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "_Vizitkarto"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Montri Trans_portilojn"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Montri _senkonektajn kontaktojn"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Montri _kontaktliston"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Kontoj"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Agoj"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Enhavo"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "A_dministri"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_Respondaro"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Helpo"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Agordo"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Eliri"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Sendi unuopan _mesaĝon..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Vido"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr ""
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Serĉi"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Aldoni _kontakton"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "Kontakta informo"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Serĉi"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "Ek"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adreso:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registri ĉe"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Nuligi"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "De:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Respondi al tiu mesaĝo"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Sen_di"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Sendi mesaĝon"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Sendi mesaĝon kaj fermi fenestron"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Temo:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Al:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Respondi"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Sendi kaj fermi"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Permesi"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 "Rifuzi abonon de kontakto, do li aŭ ŝi ne povos scii kiam vi estas konektita"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Mendo de abono"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Rifuzi"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID de kontakto, kun kiu vi volas interparoli"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Silentigi sonojn"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Sendi unuopan _mesaĝon"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Montri ĉiujn nelegitajn _eventojn"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_to"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Babilejo"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Agoj</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Propraj</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Agordo</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Risurco:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Agordo</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Priskribo</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Propraj</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Komentoj"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Administri _babilejon"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakto"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Kontakta informo"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Plu"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "Kaŝbildeto:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Sonoj</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber-trafiko</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML enigo</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Ebligi"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Informo/Peto (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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mesaĝo"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Ĉeesto"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Korekti konton..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Loka JID:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Persona"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Risurco:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+bazita jabber-kliento"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontakta informo"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3016,7 +2878,7 @@ msgstr "Entjera"
 msgid "Text"
 msgstr "Teksto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Koloro"
 
@@ -3154,134 +3016,134 @@ msgstr "Sveda"
 msgid "Chinese (Ch)"
 msgstr "Ĉina (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Lingvo de literumado"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Konekto mankas"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "Substreko"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Kaŝnomo"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "_Tiparo:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontakta informo"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Ĉifrado ebligata"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Mankas en kontaktlisto"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listo de aktivaj, plenumitaj kaj haltitaj dosiertransmetoj"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Uzi aŭtentokontrolon"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Uzi aŭtentokontrolon"
@@ -3289,58 +3151,58 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Tiu ĉi mesaĝo estas ĉifrita]"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Vi ĵus ricevis novan mesaĝon de \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3348,136 +3210,146 @@ msgstr ""
 "Se vi fermos tiun ĉi slipon kaj la historio estas malŝalta, tiu ĉi mesaĝo "
 "perdiĝos."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s nun estas %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "kreadas protokolan datumbazon"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "kreadas protokolan datumbazon"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim fermos tuj"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "kreas dosierujon %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 #, fuzzy
 msgid "Change status information"
 msgstr "Kontakta informo"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 #, fuzzy
 msgid "Change status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 #, fuzzy
 msgid "Free for chat"
 msgstr "Babilema"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 #, fuzzy
 msgid "Online"
 msgstr "naŭ"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Ne malhelpu."
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 #, fuzzy
 msgid "Presence description:"
 msgstr "Priskribo"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Nova babilejo"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s de babilejo %(room_name)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Babilejoj"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr " %d nelegita mesaĝo"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3574,9 +3446,9 @@ msgid ""
 msgstr "Listo (spacetseparita) de lineoj (kontoj kaj grupoj) kiuj rulitas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Defaŭlte"
@@ -3856,11 +3728,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:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3868,7 +3740,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:230
+#: ../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."
@@ -3876,7 +3748,7 @@ msgstr ""
 "Se \"False\", Gajim ne plu eligos statlineon en interparolaj fenestroj kiam "
 "kontakto ŝanĝas lian aŭ ŝian staton kaj/aŭ statmesaĝon."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3889,29 +3761,29 @@ msgstr ""
 "statmesaĝon. Se \"all\", Gajim eligos ĉiuj statmesaĝoj. Se \"in_and_out\", "
 "Gajim eligos nur pri eniroj/eliroj."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Fona koloro de kontaktoj kiam ili jus ensalutis."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Fona koloro de kontaktoj kiam ili jus elsalutis."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne montri kaŝbildeton por transportilo mem."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne montri kontaktliston en la sistema taskostrio."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3921,7 +3793,7 @@ msgstr ""
 "fenestran briladon (la defaŭlta konduto de plimulto da fenestragordiloj) "
 "kiam estas atendantaj eventoj."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3932,7 +3804,7 @@ msgstr ""
 "informon en babilejo."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3952,32 +3824,32 @@ msgstr ""
 "apartan fenestron. Rimarku, ŝanĝo de tiu opcio bezonas relanĉon de Gajim "
 "antaŭ la ŝanĝo efikos."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Kaŝas la butonojn en babileja fenestro."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Kaŝas rubandon en babileja fenestro"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Kaŝas rubandon en dupersona interparola fenestro"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 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:251
+#: ../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."
@@ -3985,27 +3857,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Alineo kiam uzatas unuigo de ripetaj kaŝnomoj."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Sendi mesaĝon kaj fermi fenestron"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, 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:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4013,7 +3885,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:257
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4022,7 +3894,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:258
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4031,7 +3903,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: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 "
@@ -4041,7 +3913,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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4049,7 +3921,7 @@ msgstr ""
 "Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
 "pasvortojn."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4058,7 +3930,7 @@ msgstr ""
 "Se \"True\", Gajim uzos Gnoman ŝlosilaron (se disponeblas) por konservu "
 "pasvortojn."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4066,7 +3938,7 @@ msgstr ""
 "Se \"True\", Gajim montros kvantojn de konektitaj kaj ĉiuj kontaktoj en "
 "kontaj kaj grupaj linioj."
 
-#: ../src/common/config.py:263
+#: ../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"
@@ -4074,67 +3946,83 @@ 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:264
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4142,79 +4030,84 @@ msgstr ""
 "Prioritato ŝanĝiĝos aŭtomate laŭ via stato. Prioritatoj specifatas en la "
 "agorderoj \"autopriority_*\"."
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, 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:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 ĉirkaŭiro"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4222,125 +4115,130 @@ msgstr ""
 "Se markitas, Gajim uzos vian IP kaj prokurservilojn difinitajn en la opcio "
 "file_transfer_proxies por dosiertransmeto."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Ĉu OpenPGP estas ŝaltita por tiu ĉi kontakto?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Lingvo por kiu ni volas kontroli mistajpajn vortojn"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "'all' aŭ spacetseparitaj statoj"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', aŭ 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' aŭ ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormas"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Revenos baldaŭ"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Revenos post kelkaj minutoj."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Manĝas"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Mi manĝas, do restigu mesaĝon por mi."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Kino"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Mi spektas filmon."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Laboras"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Mi laboras."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefonado"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Mi telefonas."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Eliris"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Mi eliris por amuziĝi."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Mi disponeblas."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Mi babilemas."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Revenos baldaŭ."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Mi ne disponeblas."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Ne malhelpu."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Ĝis!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4348,106 +4246,98 @@ msgstr ""
 "Sono por ludi kiam babileja mesaĝo enhavas vorton, listitan en "
 "muc_highlight_words, aŭ vian kaŝnomon."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sono ludota kiam ĉiu babileja mesaĝo venas."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "verda"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "manĝbutiko"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "homa"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "mara"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Neeblas ŝargi senfaran modulon"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Malprava servilnomo"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrada informo por transportilo %s ne venis ĝustatempe"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Vizitkarto estas sukcese publicita"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kaŝnomo malpermesita: %s"
@@ -4455,77 +4345,77 @@ msgstr "Kaŝnomo malpermesita: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Neeblas aliĝi al babilejo"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Tiu babilejo ne ekzistas."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Babileja kreado limigitas."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vi devas uzi vian registritan kaŝnomon."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vi ne ĉeestas en membrolisto."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Permeso estas forigita"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nun ni abonas %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "ordono pri abona fino de %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ni nun ne abonas pri %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4665,28 +4555,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Tiu ĉi mesaĝo estas *ĉifrita* (Vidu :JEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4695,108 +4585,108 @@ msgstr ""
 "Temo: %s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Rekonektu mane."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Nekorekta respondo"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Kontrolu vian konekton aŭ provu denove poste."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ne povas konekti al \"%s\""
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Konekto kun konto \"%s\" rompiĝis"
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Nekonata versio de D-BUS: %s"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Kontrolu vian konekton aŭ provu denove poste"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Aŭtentokontrolo malsukcesis ĉe \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Bonvolu kontroli korektecon de viaj salutnomo kaj pasvorto."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Eraro dum forigado de privata listo"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4805,45 +4695,45 @@ 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktoj"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Ne obtenita pro nevidebla stato"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Rigardiloj"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transportiloj"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Mankas en kontaktlisto"
 
@@ -4852,37 +4742,53 @@ msgstr "Mankas en kontaktlisto"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (ankaŭ konata kiel python-pysqlite2) mankas. Finas..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, 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."
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 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:63
+#: ../src/common/exceptions.py:67
 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."
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Seancbuso nedisponeblas.\n"
+"Provu legi http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Seancbuso nedisponeblas.\n"
 "Provu legi http://trac.gajim.org/wiki/GajimDBus"
@@ -5050,240 +4956,277 @@ msgstr "Fino de semajno"
 msgid "Weekend!"
 msgstr "Semajnofino!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Malkorekta signo en salutnomo."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Necesas adreso de servilo."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Malkorekta signo en servilnomo."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Malkorekta signo en risurcnomo."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Okupata"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Nedisponebla"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Babilema"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Babilema"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Enrete"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Enrete"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Konektas"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Fora"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Senkonekta"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Senkonekta"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "Ne_videbla"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Nekonata"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Eraroj"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Al"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Nenion"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Aboni"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderigantoj"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderiganto"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Partoprenantoj"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Partoprenanto"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Vizitantoj"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Vizitanto"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Neniu"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Mastro"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administristo"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "atentas al la komunikado"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "faras ion alian"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "paŭzas tajpi mesaĝon"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "fermis la interparolan fenestron aŭ slipon"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Agordo de babilejo"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5293,17 +5236,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr "%s ne estas valida protokola detalnivelo"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Defaŭlta statmesaĝo"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Longo: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "eraro: %s nedisponeblas por legi"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "blua"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "indeksigas protokolan datumbazon"
 
@@ -6009,19 +6009,19 @@ msgstr ""
 msgid "Writing"
 msgstr "Laboras"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6029,12 +6029,12 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -6043,7 +6043,7 @@ msgstr ""
 "estos nuligita."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6112,26 +6112,22 @@ 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:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "malŝaltitaj"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Defaŭlta statmesaĝo"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Ebligi"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Vortaro mankas por %s lingvo"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6140,214 +6136,214 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "statmesaĝa titolo"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "statmesaĝa teksto"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Nomo"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Ĉu rekonektu nun?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP estas neuzebla ĉe tiu ĉi komputilo"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Nelegitaj eventoj"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Legu ĉiujn atendantajn eventojn antaŭ forigi tiun konton."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vi havas aktivan konversacion ĉe konto %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Nun vi estas konektita al la servilo"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Kontnomo jam estas uzata"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 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:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Kontnomo ne povas esti malplena."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Kontnomo ne povas enteni spacetojn."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "Administri kontojn"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber-ID devas esti en la formo \"uzulo@servilnomo\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "La pordo devas esti nombro."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Ricevado de sekreta ĉifroŝlosilo malsukcesis"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Estas problemo ricevi vian sekretan OpenPGP-ĉifrŝlosilon."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Elekto de OpenPGP-ĉifrŝlosilo"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Elektu vian OpenPGP-ĉifrŝlosilon"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Tia konto nedisponebla"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr "Vi devas krei konton antaŭ korekti vian personan informon."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Senkonekte vi ne povas ŝanĝi vian personan informon."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Via servilo ne subtenas Vizitkarton"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Via servilo ne povas konservi vian personan informon."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Por ke ŝanĝi kontnomon, vi devas esti senkonekta."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Loka konto jam ekzistas."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Administri %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registri ĉe %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Listo de malpermesoj"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Membra listo"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Listo de mastroj"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Estra listo"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Kialo"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Kaŝnomo"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Rolo"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Malpermesas..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6355,11 +6351,11 @@ msgstr ""
 "<b>Por kiu vi volas malpermesi aliĝon?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Aligas membron..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6367,11 +6363,11 @@ msgstr ""
 "<b>Kiun vi volas fari membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Aligas mastron..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6379,11 +6375,11 @@ msgstr ""
 "<b>Kiun vi volas fari mastro?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Aligas administriston..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6391,7 +6387,7 @@ msgstr ""
 "<b>Kiun vi volas fari administristo?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6408,59 +6404,87 @@ msgstr ""
 "4. domajno (iu kombinaĵo de risurco kaj uzulo\n"
 "kun tiu domajno aŭ subdomajno)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Forigado de konto %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Ĉifrado malebligata"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Pasvorto necesas"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enigi vian pasvorton por konto %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Konservi pasvorton"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Se vi forigos ĝin, la konekto disiĝos."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Konektado malsukcesis"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Kion vi volas fari?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Forigi konton _nur el Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Defaŭlte"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "Ĉiujn"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Nur en/el-iradojn"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "Neniujn"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Tiu ĉi legosigno havas malkorektan datumon"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6468,31 +6492,31 @@ msgstr ""
 "tiun ĉi legosignon."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Kaŝnomo malpermesita: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Malkorekta rikordo"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Konto estas sukcese aldonita"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6502,34 +6526,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:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Vi devas enigi salutnomon por administri tiun ĉi konton."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 #, 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:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6539,7 +6563,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6547,61 +6571,61 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Eraro okazis dum kreado de konto"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Kontnomo estas uzata"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Vi jam havas konto kun tiu nomo."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktiva"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Unua mesaĝo ricevita"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Sekva mesaĝo ricevita"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakto konektita"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakto malkonektita"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Mesaĝo sendita"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Emfazado de mesaĝoj en babilejo"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Ricevitas mesaĝo en babilejo"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "GMail-retletero venis"
 
@@ -6621,45 +6645,45 @@ msgstr ""
 "Teksto sub tiu ĉi lineo estas, kio estas dirita post kiam vi lastfoje "
 "atentis al tiu ĉi babilejo"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Eliri"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Agoj por \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Legi _vikipedian artikolon"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Serĉi tion en _vortaro"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Retserĉila URL ne enhavas \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Retserĉi tion"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Malfermi  kiel _ligilon"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6667,7 +6691,7 @@ msgstr[0] "Hieraŭ"
 msgstr[1] "Hieraŭ"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temo: %s\n"
@@ -6777,71 +6801,71 @@ 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Malkorekta uzula ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "La uzula ID devas ne enteni risurcon."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakto jam estas en kontaktlisto"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Tiu kontakto jam ĉeestas en via kontaktlisto."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Uzula ID:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber-kliento"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Versio de GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Versio de PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Nunaj programistoj:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Ĝisnunaj programistoj:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "DANKON AL:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Sergio Ĥlutĉin <Sergey.Khlutchin@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6852,107 +6876,107 @@ msgstr ""
 "Vi bezonas Instali la vortaron %s por uzi literumadon, aŭ elekti alian "
 "lingvon ĉe la agordero \"speller_language\"."
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Demando pri abono de %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vi jam estas en babilejo %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Eniri en babilejon per konto %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Malkorekta kontnomo"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, 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:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Malkorekta babileja jabber-ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "La babileja jabber-ID enhavas nepermesajn signojn."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Tio ne estas babilejo"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ne estas la nomo de babilejo."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Servilo"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Konto \"%s\" estas konektita al la servilo"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Babili per konto %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Babili"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6961,173 +6985,171 @@ msgstr ""
 "al kiu vi volas sendi mesaĝon:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Konekto mankas"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Bonvolu konvinkiĝi, ke vi estas konektita kun \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Malkorekta jabber-ID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Neeblas analizi \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Senkonekta vi ne povas ŝanĝi vian pasvorton."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Malkorekta pasvorto"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Vi devas enigi pasvorton."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Pasvortoj diversas"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "En ambaŭ kampoj la pasvortoj devas esti identaj."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakto ensalutis"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakto elsalutis"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nova mesaĝo"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nova unuobla mesaĝo"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nova privata mesaĝo"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Nova retletero"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Dosiertransmeta eraro"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Dosiera transmeto plenumis"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Dosiera transmeto haltitas"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Babileja invitilo"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakto ŝanĝis sian staton"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Unuopa mesaĝo per konto %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Unuopa mesaĝo ĉe konto %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Unuopa mesaĝo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Sendi %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Ricevitas %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skribis:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konzolo por %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML-konzolo"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Malrapidas"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Forigi"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7135,156 +7157,156 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Aldoni"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "_Korekti"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Forigi"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber-ID:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Mi volus aldoni vin al mia kontaktlisto."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Aldoni _kontakton"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privata listo <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privata listo por %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordnumero: %s, ago: %s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redakti regulon</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aldoni regulon</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privataj listoj por %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Privataj listoj"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Malkorekta listnomo"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Vi devas enigi nomon por krei privatan liston."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Al vi oni malpermesis esti en la babilejo."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact invitas vin al la babilejo %(room_jid)s"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Komento: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Elektu sonon"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Ĉiuj dosieroj"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav-sonoj"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Elektu bildon"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Bildoj"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kiam %s venas:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Aligado de speciala avizo por %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "n°"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Kondiĉo"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "dum mi estas "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7292,38 +7314,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7333,77 +7355,77 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Aliaj"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Babilejoj"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Senkonekta vi ne povas rigardi disponeblajn servojn"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Serĉado de servoj per konto %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Serĉado de servoj"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Neniu servo estas trovita"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7411,97 +7433,102 @@ msgstr ""
 "Servo mankas ĉe la adreso, kiun vi enigis, aŭ ĝi ne respondas. Kontrolu la "
 "adreson kaj provu denove."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Tiu ĉi servo ne rigardeblas"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Malkorekta salutnomo"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Rigardado %s per konto %s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Rigardi"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Tiu ĉi servo ne havas erojn por rigardi."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Plenumi komandon..."
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistri"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanas %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Uzuloj"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Priskribo"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Starigi legosignon por tiu babilejo"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Legosigno jam estas metita"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Babilejo \"%s\" jam estas en viajn legosignojn."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Legosigno sukcese aldonitas"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 #, fuzzy
 msgid "Node"
 msgstr "Neniu"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Nova mesaĝo"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Aboni"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Malaboni"
 
@@ -7550,7 +7577,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7716,102 +7743,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "Servilaj trajtoj"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Dosiero"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Dosiernomo: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Sendanto: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Ricevanto: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Konservita kiel: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Dosiertransmeto plenumitas"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Malfermi enhavantan dosierujon"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Dosiera transmeto nuligitas"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Ricevanto: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Erara mesaĝo: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Dosiera transmeto haltitas"
@@ -7820,7 +7835,7 @@ msgstr "Dosiera transmeto haltitas"
 msgid "Choose File to Send..."
 msgstr "Elektu dosieron por sendi..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Priskribo: %s"
@@ -7853,34 +7868,34 @@ msgstr "Priskribo: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s volas sendi al vi dosieron:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ne povas reskribi ekzistan dosieron \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../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 ""
 "Dosiero kun tiu nomo jam ekzistas kaj vi ne havas permeson reskribi ĝin."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Tiu dosiero jam ekzistas"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Dosierujo \"%s\" ne skribeblas"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Vi ne havas permeson krei dosierojn en ĉi tiu dosierujo."
 
@@ -7916,76 +7931,56 @@ msgstr "Dosiero: "
 msgid "It is not possible to send empty files"
 msgstr "Neeblas sendi senenhavajn dosierojn"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Nomo: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Sendanto: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Paŭzo"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Daŭrigi"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim bezonas X-servilon. Finas..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim bezonas PyGTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim bezonas GTK 2.8 aŭ pli novan"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim bezonas GTK 2.8 aŭ pli novan por funkcii. Finas..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Mankas subteno de libglade en GTK+"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Bonvolu forigi vian nuntempan GTK+ bibliotekon kaj instali la plej lastan "
-"stabilan version de %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Bonvolu kontroli ke GTK+ kaj PyGTK en via sistemo subtenas la bibliotekon "
-"libglade."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim bezonas PySqlITE2 por funkcii"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim bezonas pywin32 por funkcii"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7995,11 +7990,11 @@ msgstr ""
 "povas preni ĝin ĉe %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim jam estas lanĉita"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8042,8 +8037,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "konto"
 
@@ -8065,13 +8060,16 @@ msgid "status"
 msgstr "stato"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "unu el: senkonekta, enrete, babilas, fora, nedisponebla, okupata, nevidebla "
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "mesaĝo"
 
@@ -8307,76 +8305,95 @@ msgstr ""
 "kontoj"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Prilabori xmpp:/ uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "mesaĝenhavo"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Aliĝi al MUC-babilejo"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "babilejo"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Babilejo:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "kaŝnomo"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Kaŝnomo ne trovitas: %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "pasvorto:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Pasvortoj diversas"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Bonvolu certiĝi ke avahi-demono estas aktiva."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Montras aŭ kaŝas la kontaktlistan fenestron"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Mankas argumento \"kontakt-jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8385,31 +8402,31 @@ msgstr ""
 "%s mankas en via kontaktlisto\n"
 "Bonvolu specifi konton por sendi la mesaĝon."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Vi ne havas aktivan konton"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumentoj:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s ne trovitas"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8418,7 +8435,7 @@ msgstr ""
 "Uzado: %s komando [argumentoj]\n"
 "Komando estas unu el:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8427,7 +8444,7 @@ msgstr ""
 "Tro multe da argumentoj. \n"
 "Enigu \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8436,7 +8453,11 @@ msgstr ""
 "Argumento \"%s\" ne estas specifita. \n"
 "Enigi \"%s help %s\" por plia informo"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Malprava uri"
 
@@ -8466,198 +8487,199 @@ msgstr "Vi ne povas forigi aktivan etoson"
 msgid "Please first choose another for your current theme."
 msgstr "Bonvolu komence aktivigi alian etoson."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Sendado de privata mesaĝo malsukcesis"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Enmeti kaŝnomon"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historio de interparoloj"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konekto"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Via nova konto estas sukcese kreita"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s estas elpelita: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, 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:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vi nomiĝas %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s nomiĝas %s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aparteneco:"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s foriris"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s aliĝis al la babilejo"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 nun estas %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Ne plu demandi"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Korektas temon"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Bonvolu enigi novan temon:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Ŝanĝas kaŝnomon"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Bonvolu enigi la novan kaŝnomon, kiun vi volas uzi:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Priskribo: %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Elpelatas %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Vi povas specifi kialon sube:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Malpermesas %s"
@@ -8676,59 +8698,59 @@ msgstr "Tio eble ne estas fatala, sed malgraŭ raportinda al la programistoj."
 msgid "_Report Bug"
 msgstr "_Raporti pri eraro"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detalaĵoj"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Eraro: ne povas malfermi %s por legi"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim ne estas defaŭlta jabber-kliento"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 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:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Kromaĵo ne subtenatas"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Konservi bildon kiel..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8738,168 +8760,168 @@ msgstr ""
 "Via dezirata kaŝnomo estas uzata aŭ registrita per alia uzulo.\n"
 "Bonvolu specifi alian kaŝnomon jene:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Ĉu vi akceptas tiun peton?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Aŭtentokontrolo por %s (id: %s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Konektado malsukcesis"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "eraro dum sendado %s ( %s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Mendo de abono"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Permespeto akceptitas"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakto \"%s\" nuligis abonon de vi"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Malaboni"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakto kun \"%s\" neestableblas"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Nun vi estas konekta sen uzado de via OpenPGP-ŝlosilo."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Via pasfrazo estas malvalida"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nova retletero ĉe %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8909,102 +8931,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Forigas kontakton el kontaktlisto"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Eraro dum legado de dosiero:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En ĉ_iu mesaĝo"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Bonvolu enigi novan salutnomon por via loka konto"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Konflikto de salutnomoj"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s volas sendi dosieron al vi."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Mendo de dosiera transmeto"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9012,15 +9035,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9031,90 +9054,100 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konekto"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"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:2064
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Ĉifrado malebligata"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Ne povis konservi vian agordon"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Pasfrazo necesas"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Enigi GPG-ŝlosilan pasfrazon por konto %s."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Malprava pasfrazo"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
 
@@ -9123,44 +9156,44 @@ msgstr "Bonvolu ripeti vian GPG-pasvorton aŭ klaku Nuligi."
 msgid "_New Group Chat"
 msgstr "Nova babilejo"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Mi volus aldoni vin en mian kontaktliston"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Ne povas trovi datumbazon de protokoloj"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontaktoj"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Kaŝnomo"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Mesaĝo"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9174,26 +9207,26 @@ msgstr ""
 "\n"
 "Se vi alklakos JES, bonvolu atendi..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Eksportas protokolojn..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Tio ĉi estas neinversigebla ago."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9232,38 +9265,38 @@ msgstr "Stato nun estas: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stato nun estas: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ne povas alŝuti bildon"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Vi nekonektitas al la servilo"
 
-#: ../src/message_window.py:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Babilejoj"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Privataj interparoloj"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Mesaĝoj"
 
@@ -9275,22 +9308,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ŝanĝis staton"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s ensalutis"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s elsalutis"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova unuopa mesaĝo de %(nickname)s"
@@ -9315,7 +9348,7 @@ msgstr "Nova mesaĝo de %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nova mesaĝo de %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "naŭ"
@@ -9324,12 +9357,12 @@ msgstr "naŭ"
 msgid "Retrieving profile..."
 msgstr "Obtenas vizitkarton..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "Dosierindiko"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tiu babilejo ne ekzistas."
@@ -9337,7 +9370,7 @@ msgstr "Tiu babilejo ne ekzistas."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Ne povas alŝuti bildon"
 
@@ -9367,51 +9400,51 @@ msgid ""
 "later."
 msgstr "Estis eraro dum publicado de persona informo, provu denove pli poste."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Unuigaj kontoj"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Permeso estas sendita"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ekde nun \"%s\" konos vian staton."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Demando pri abono estas sendita"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Permeso estas forigita"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ekde nun \"%s\" ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vi estos konektita al %s sen OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Vi partoprenas en unu aŭ kelkaj babilejoj"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9419,44 +9452,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ĉu vi certe volas foriri el babilejo \"%s\"?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Nuligi dosiertransmeton"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Vi havas nelegitajn mesaĝojn"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, 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:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Legu ilin antaŭ forigi tiun transportilon."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transportilo \"%s\" estos forigita"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9464,11 +9508,11 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiu ĉi "
 "transportilo."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transportiloj estos forigita"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9477,69 +9521,69 @@ msgstr ""
 "Vi ne plu eblos sendi kaj ricevi mesaĝojn kun kontaktoj el tiuj ĉi "
 "transportiloj:%s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 #, 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:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Renomigado de kontakto"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Enigu novan kaŝnomon por kontakto %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Renomigi grupon"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Enigu novan nomon por la grupo %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Forigi grupon"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 #, 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Atribui OpenPGP-ŝlosilon"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Elektu ŝlosilon por atribui al la kontakto"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakto \"%s\" estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9548,12 +9592,12 @@ msgstr ""
 "vidos vin kiel senkonekta."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Kion vi volas fari?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9561,16 +9605,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktoj estos forigita el via kontaktlisto"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9579,32 +9623,32 @@ msgstr ""
 "Forigante tiujn kontaktojn: %s\n"
 "vi forigas ankaŭ permesojn, rezulte ili ĉiam vidos vin kiel senkonekta."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Neniu konto disponeblas"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakta tenejo ne estas subtenata de via servilo"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9613,12 +9657,12 @@ msgstr ""
 "Via servilo ne subtenas konservadon de metakontakta informo. Do tia informo "
 "ne estas konservota dum sekva rekonekto."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9628,24 +9672,24 @@ msgstr ""
 "Ĝenerale ĝi estas uzata kiam unu persono havas kelkajn jabber-kontojn aŭ "
 "transportajn kontojn."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Malkorekta dosiero"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Sendi %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Igi %s kaj %s metakontaktoj"
@@ -9655,134 +9699,138 @@ msgstr "Igi %s kaj %s metakontaktoj"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "per konto %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "al konto %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "per konto %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Aranĝi _legosignojn..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "de konto %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "por konto %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "Ŝanĝi stat_mesaĝon"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publici"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Publici"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Serĉi servojn..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Sendi _grupan mesaĝon"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Al ĉiuj uzantoj"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Al ĉiuj konektitaj uzantoj"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomigado de kontakto"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Aranĝi _Grupojn"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Sendi unuopan mesaĝon"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Plenumi komandon..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportiloj"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Montri Trans_portilojn"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Renomigi"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontakto malkonektita"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontakto malkonektita"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Historia administrilo"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Eniri babilejen"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Ŝanĝi statmesaĝon..."
 
@@ -9817,9 +9865,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9832,119 +9880,129 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "Ŝanĝi _statmesaĝon..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Mankas en kontaktlisto"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Kaŝi tiun ĉi menuon"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Risurco: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Lasta stato: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " ekde %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "Konekto"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontakto malkonektita"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Abono: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Konta korektado"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Elŝuti"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Alŝuti"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Transmetitas: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Ne lanĉitas"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Haltis"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Plenumita"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "Paŭzas"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Malrapidas"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Transdonas"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Tiu ĉi servo ankoraŭ ne respondis kun detala informo"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9952,30 +10010,30 @@ msgstr ""
 "Tiu ĉi servo ne povis respondi per detala informo.\n"
 "Ĝi verŝajne estas malnova aŭ rompita"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Nekonata"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "ekde %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Programoj</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9983,36 +10041,344 @@ msgstr ""
 "Tiu ĉi kontakto interesiĝas pri via ĉeesta informo, sed vi ne interesiĝas "
 "pri ŝia/lia ĉeesto"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 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:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 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:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Vi atendas respondon de kontakto pri via abona mendo"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " risurco kun prioritato "
 
+#, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Eniri en babilejon"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Aldoni kontakton..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Serĉi servojn"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Plenumi komandon..."
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "Korekti konton"
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Persona detalaĵoj"
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "_Ekparoli"
+
+#~ msgid "_Status"
+#~ msgstr "_Stato"
+
+#~ msgid "Account Modification"
+#~ msgstr "Konta korektado"
+
+#~ 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 ""
+#~ "Marku tion por ke Gajim konektos al pordo 5223 kie malnovaj serviloj "
+#~ "atendas SSL-kapablajn konektojn. Rimarku ke Gajim defaŭlte uzas TLS-"
+#~ "ĉifradon se la servilo subtenas ĝin, kaj tiu opcio malŝaltas TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Korekti personan informon..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Servilnomo: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Se markitas, Gajim konservos pasvorto en ~/.gajim/config kun legpermeso "
+#~ "nur por vi."
+
+#~ msgid "Port: "
+#~ msgstr "Pordo: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Prokura servilo:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Konservi pas_frazon (malsekure)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Sendi vivkontrolajn pakaĵojn"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Uzi _SSL (malnovan)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Alĝustigi laŭ stato"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Forigi tagmesaĝon"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Sendi servilan mesaĝon"
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Mesaĝo venas\n"
+#~ "Kontakto senkonektas\n"
+#~ "Kontakto ŝanĝas staton\n"
+#~ "Emfazita babileja mesaĝo\n"
+#~ "Babileja mesaĝo venas\n"
+#~ "Dosiertransmeta peto\n"
+#~ "Dosiertransmeto komencis\n"
+#~ "Dosiertransmeto finis"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontakto(j)\n"
+#~ "grupo(j)\n"
+#~ "ĉiuj"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Eniri en babilejon"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopii JID/retpoŝtan adreson"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopii ligilan lokon"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Malfermi retpoŝtredaktilon"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Malfermi ligilon per retrigardilo"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Ekparoli"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Konta linio\n"
+#~ "Grupa linio\n"
+#~ "Kontakta linio\n"
+#~ "Rubando"
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "Ŝanĝi kaŝ_nomon"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "Ŝanĝi _temon"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Administri _babilejon"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Aranĝi legosignojn"
+
+#~ msgid "Send _File"
+#~ msgstr "Sendi _dosieron"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Aldoni al kontaktlisto"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Sendi privatan mesaĝon"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Administri kontojn"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "Forigi"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Aligas kontakton en kontaktliston"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Starigi legosignon por tiu babilejo"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Ŝanĝi kaŝ_nomon"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "atentas al la komunikado"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Klaku por enigi mienon (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Klaku por enigi mienon (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Klaku por enigi mienon (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "pri ĉiuj babilstatoj\n"
+#~ "nur pri tajpado\n"
+#~ "neniam"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Aŭtodetekti dum ĉiu Gajim lanĉo\n"
+#~ "Ĉiam uzi defaŭlton de GNOME\n"
+#~ "Ĉiam uzi defaŭlton de KDE\n"
+#~ "Ĉiam uzi defaŭlton de Xfce\n"
+#~ "Propraj"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "neniu\n"
+#~ "ambaŭ\n"
+#~ "de\n"
+#~ "al"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Forigi"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "_Aldoni kontakton..."
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "Servilaj trajtoj"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Dosieraj _transmetoj"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "_Vizitkarto"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Kontoj"
+
+#~ msgid "_Contents"
+#~ msgstr "_Enhavo"
+
+#~ msgid "_FAQ"
+#~ msgstr "_Respondaro"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Agordo"
+
+#~ msgid "_Quit"
+#~ msgstr "_Eliri"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Sendi unuopan _mesaĝon..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Sendi unuopan _mesaĝon"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_to"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Babilejo"
+
+#~ msgid "Enable"
+#~ msgstr "Ebligi"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Korekti konton..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Malprava servilnomo"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (ankaŭ konata kiel python-pysqlite2) mankas. Finas..."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "Mankas subteno de libglade en GTK+"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Bonvolu forigi vian nuntempan GTK+ bibliotekon kaj instali la plej lastan "
+#~ "stabilan version de %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Bonvolu kontroli ke GTK+ kaj PyGTK en via sistemo subtenas la bibliotekon "
+#~ "libglade."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim bezonas PySqlITE2 por funkcii"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "Ve_nanta mesaĝo:"
 
@@ -10204,10 +10570,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim-konto %s"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Propraj</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Ripeta Jabber-ID"
 
@@ -10393,9 +10755,6 @@ msgstr " risurco kun prioritato "
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "Starigi statmesaĝon por reflekti kurantan ludantan _muzikaĵon"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Montri nur en _kontaktlisto"
-
 #~ msgid "The auto away status message"
 #~ msgstr "La aŭtomate fora statmesaĝo"
 
@@ -10429,18 +10788,9 @@ msgstr " risurco kun prioritato "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Kroma agordo de avizado..."
 
-#~ msgid "_Never"
-#~ msgstr "_Neniam"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Avizi min pri tio"
-
 #~ msgid "_Player:"
 #~ msgstr "_Ludilo:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Antaŭigi la fenestron"
-
 #~ msgid "Address"
 #~ msgstr "Adreso"
 
diff --git a/po/es.po b/po/es.po
index ac0e1d936..c0f8e4f07 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-06 22:12+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-08-19 23:49+0200\n"
 "Last-Translator: Membris Khan <frank@giingo.org>\n"
 "Language-Team: none <>\n"
@@ -17,59 +17,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un cliente de Jabber en GTK"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Entrar a un grupo de charla"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Añadir contacto..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Descubrir servicios"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Ejecutar comando..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Modificar cuenta"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir bandeja de entrada de GMail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "Eventos _personales"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "Iniciar conver_sación"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Estado"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -79,23 +31,23 @@ msgstr ""
 "\n"
 "Por favor espera..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor, elige una de las siguientes opciones:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "Por favor, introduce los datos de tu cuenta actual"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../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/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -103,204 +55,206 @@ msgstr ""
 "Añadir este certificado a la lista de certificados de confianza.\n"
 "Huella SHA1 del certificado:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Autentificación a_nónima"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Conectar cuando presione Finalizar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Asistente para crear una cuenta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Ya tengo una cuenta y quiero usarla"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Si está marcado, Gajim recordará la contraseña para esta cuenta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Gestionar..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ninguno"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Pro_xy"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "_Guardar contraseña"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Definir mi perfil cuando me conecte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Usar nombre de host y puerto personalizados"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
 msgstr "Debes tener una cuenta antes de conectar a la red Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Finalizar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "Nombre del host:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "C_ontraseña:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Miscelánea</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Información personal</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "Ajustar al esta_do"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Cuenta"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Modificar cuenta"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Cuentas"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Operaciones de administración"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Autentificación anónima"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Autoreconectar si se pierde la conexión"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar al inicio de Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Cam_biar contraseña"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Marcando esta opcón, Gajim conectará al puerto 5223 cuando un servidor viejo "
-"use SSL. Observa que Gajim usa encripatdo TLS por defecto si estádisponible "
-"en el servidor, y que con esta opción se desactiva el TLS"
+"Marca esto para que Gajim te pregunte antes de enviar tu contraseña a través "
+"de una conexión no segura."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Elegir _clave..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Click para cambiar la contraseña de la cuenta"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Haz click para solicitar una autorización a todos los contactos para una "
 "nueva cuenta"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Co_nectar al inicio de Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "_Editar información personal personales..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Correo-e:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Nombre:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1156
-#: ../src/common/helpers.py:1168 ../src/notify.py:553 ../src/notify.py:574
-#: ../src/notify.py:612 ../src/notify.py:624
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:59 ../src/common/contacts.py:140
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2747
-#: ../src/roster_window.py:5259
+#: ../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 "General"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Nombre del host:"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -308,8 +262,12 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -317,16 +275,7 @@ msgstr ""
 "Si está marcado, Gajim enviará paquetes de mantenimiento de actividad para "
 "prevenir desconexiones por expiración"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Si está marcado, Gajim guardará la contraseña en ~/.gajim/config con acceso "
-"de lectura sólamente para tí"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -334,8 +283,7 @@ msgstr ""
 "Si está marcado, Gajim, cuando se inicie, conectará automáticamente a Jabber "
 "usando esta cuenta."
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -345,47 +293,50 @@ msgstr ""
 "desplegable de la parte inferior de la lista de contactos) cambiará el "
 "estado de esta cuenta de forma acorde"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Información acerca de tí a guardar en el servidor"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1702
-#: ../src/config.py:2252
+#: ../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 "ID de Jabber:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Apellido(s):"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Combinar las cuentas"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1215
-#: ../src/config.py:1318 ../src/config.py:1606 ../src/config.py:1611
-#: ../src/config.py:2159 ../src/config.py:2238 ../src/config.py:2251
-#: ../src/config.py:3452 ../src/config.py:3525 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2801 ../src/roster_window.py:2807
-#: ../src/roster_window.py:2812
-msgid "None"
-msgstr "Ninguno"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Puerto: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Pr_ioridad:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -395,22 +346,20 @@ msgstr ""
 "del servidor cuando dos o más clientes están conectados usando la misma "
 "cuenta. El cliente con mayor prioridad recibe los eventos."
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "La prioridad cambiará automáticamente acorde a tu estado."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Re_nombrar"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Re_curso: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -425,201 +374,89 @@ msgstr ""
 "tiempo. El recurso que tenga la prioridad más alta será el que reciba los "
 "eventos (mira más abajo)."
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Guardar contraseña (inseguro)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Grabar conversaciones para todos los contactos"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Enviar paquetes de mantenimiento de actividad"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Enviar pa_quetes de mantenimiento de actividad"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar el estado de la cuenta con el estado global"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Sincronizar contactos"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Usar _SSL (el viejo)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Usar proxies para las transferencias de archivo"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Ajustar al estado"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Nombre: "
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "Ajustar al esta_do"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Cuentas"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Autentificación anónima"
-
-#: ../data/glade/accounts_window.glade.h:13
-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."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Co_nectar al inicio de Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Correo-e:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Nombre:"
-
-#: ../data/glade/accounts_window.glade.h:24
-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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1729
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Apellido(s):"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Combinar las cuentas"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5214
-msgid "Re_name"
-msgstr "Re_nombrar"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Enviar pa_quetes de mantenimiento de actividad"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Sincroni_zar el estado de la cuenta con el estado global"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Sincronizar contactos"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Usar agente G_PG"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Usar nombre de h_ost y puerto personalizados"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Usar puert_o personalizado:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Usar proxies para las transferencias de archivo"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Editar información personal..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "Ha_bilitar"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "Nombre del _host:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Gestionar..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Puerto:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Advertir antes de usar una conexión no segura"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_usar variable de entorno HTTP__PROXY"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Cuenta:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Añadir un contacto"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -631,7 +468,7 @@ msgstr ""
 "protocolo. Pulsa el botón Registrar\n"
 "para proceder."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -639,410 +476,466 @@ msgstr ""
 "Debes estar conectado al transporte para poder\n"
 "añadir un contacto de este protocolo."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Alias:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protocolo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registrar"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Ha ocurrido un error:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Elige el comando a ejecutar:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Comandos Ad hoc - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Comprobar de nuevo"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Descripción del error..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Por favor, espera mientras se solicita la lista de comandos..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Por favor, espera mientras se envía el comando..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Por favor, espera..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Esta entidad de jabber no expone comandos."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Descripción</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Editor avanzado de configurción"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Eliminar MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Elimiina mensaje del día"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Listas de _privacidad"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 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/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Definir MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Define el mensaje del día"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Mostrar consola _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Actualizar MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Actualiza el mensaje del día"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Enviar mensaje de servidor"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Acciones</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Condiciones</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sonidos</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Acciones A_vanzadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Control de Notificaciones Avanzadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Todos los estados"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:231
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Ausente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Ocupado "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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"
+
+#: ../data/gui/advanced_notifications_window.ui.h:16
+#, fuzzy
+msgid "Group Chat Message Highlight "
+msgstr "Resaltado de mensaje de grupo de charla"
+
+#: ../data/gui/advanced_notifications_window.ui.h:17
+#, 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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:241
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Lanzar un comando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:214
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "No disponible"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Uno o más estados especiales..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "En línea / Libre para hablar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Reproducir un _sonido"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Recibir un mensaje\n"
-"Contacto conectado \n"
-"Contacto desconectado \n"
-"Contacto cambia de estado \n"
-"Mensaje de grupo de charla resaltado \n"
-"Mensaje de grupo de charla recibido \n"
-"Petición de transferencia \n"
-"Transferencia iniciada \n"
-"Transferencia finalizada"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/gui/advanced_notifications_window.ui.h:25
+#, fuzzy
+msgid "Receive a Message"
+msgstr "Nuevo mensaje privado"
+
+#: ../data/gui/advanced_notifications_window.ui.h:26
 msgid "When "
 msgstr "Cuando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 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"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../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/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Deshabilitar ventanas emergentes existentes"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Deshabilitar sonidos existentes para este evento"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Deshabilitar mostar eventos en el roster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Deshabilitar mostrar eventos en el systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informarme con una ventana emergente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Abrir ventana de conversación con este usuario"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Mostrar evento en roster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Mostrar evento en systray"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "y yo "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"contacto(s)\n"
-"grupo(s)\n"
-"todo el mundo"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "para "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entrada:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Nombre del feed:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Última modificación:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Nueva entrada recibida"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Has recibido una nueva entrada:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Contactos bloqueados"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Mensaje:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Definir Actividad"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Define una actividad"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Mensaje:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Estado de ánimo</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Introdúcela de nuevo para confirmar:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Introduce nueva contraseña:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Actividad:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Estado de ánimo:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Mensajes predefinidos:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Guardar como predefinido..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Entrar a un grupo de charla"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Añadir al roster"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Copiar la dirección de correo/ID de Jabber"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Copiar la dirección del enlace"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Abrir el compositor de correo"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Abrir enlace en navegador"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "Iniciar conversación"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Enviar"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "In_vitar"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "¡Invitar amigos!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "Servidor MUC"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Por favor selecciona un servidor MUC."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1050,191 +943,189 @@ msgstr ""
 "Vas a comenzar una conversación multiusuario.\n"
 "Selecciona los contactos a invitar"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "Pregunta para ver _su estado"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Añadir _notificación especial..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Asignar clave Open_PGP..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Ejecutar comando..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Editar _grupos..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5169
-#: ../src/roster_window.py:5324
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "In_vitar a"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Invitar _Contactos"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "_Eliminar"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5179
-#: ../src/roster_window.py:5411
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Envía estado personalizado"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Enviar mensaje..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Enviar _archivo"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Definir _Avatar personalizado..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Iniciar conversación"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Alternar cifrado End to End"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Alternar cifrado OpenPGP"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Añadir al roster"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "Permitirle ver mi estado"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5238
-#: ../src/roster_window.py:5361 ../src/roster_window.py:5488
+#: ../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 "_Bloquear"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "Prohibirle ver mi estado"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5557
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignorar"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Gestionar contacto"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Renombrar..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Subscripción"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5232
-#: ../src/roster_window.py:5355 ../src/roster_window.py:5485
+#: ../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 "_Desbloquear"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_No ignorar"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Rellenar el formulario."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configuración del salón"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Editar grupos"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "Información <b>ESession</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Verificar"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Características"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Cancela la transferencia"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Cancela la transferencia de archivo seleccionada"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Limpiar"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Transferencias"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Oculta la ventana"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias de la lista"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1242,76 +1133,75 @@ msgstr ""
 "Esta acción elimina transferencias de la lista. Si la transferencia está "
 "activa, es primero detenida y luego eliminada"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Cuando una transferencia se completa, muestra una notificación emergente"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Continuar"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificarme cuando una transferencia finalice"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Abrir carpeta contenedora"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "lista de transferencias"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../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/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Cuenta\n"
-"Grupo\n"
-"Contacto\n"
-"Banner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Cuenta"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Componiendo"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Contacto"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Estilo:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Personalización de temas de Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Me fui"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1319,7 +1209,7 @@ msgstr ""
 "MUC\n"
 "Messages"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1327,109 +1217,73 @@ msgstr ""
 "Mensajes dirigidos\n"
 "a los salones"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pausado"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Color del texto:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Fuente del texto:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Fondo"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Cambiar _Alias"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Cambiar el _tema"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Configurar el salón"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1745
-msgid "_Bookmark"
-msgstr "_Marcador"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Desmantelar salón"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Gestionar salón"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimizar al cerrar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Acciones de ocupante"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Enviar archivo"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Añadir a la lista de contactos"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Banear"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Miembro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Propietario"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Enviar mensaje privado"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Crear nuevo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:256
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:188
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
 #: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Tema"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1440,25 +1294,19 @@ msgstr ""
 "no se encuentre en ejecución. Generalmente evita eliminaciones relativas a "
 "contactos con los que te encuentres hablando en este momento."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3005
-#: ../src/dialogs.py:3102
-msgid "Delete"
-msgstr "Eliminar"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Exportar"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gestor de Histórico de Gajim"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1472,493 +1320,421 @@ 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/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Buscar en la base de datos"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Introduce JID o nombre de contacto\n"
-"Históricos de charlas de grupo\n"
-"Todos los históricos de charlas"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Nombre de contacto"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Grupos de charla"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Buscar"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "Añadir este salón a marcadores (Ctrl+B)"
+msgid "Bro_wse Rooms"
+msgstr "_Navegar"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2075
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Alias:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Contraseña: "
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Recientemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Salón:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1305
-#: ../src/disco.py:1749
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+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)"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Gestionar cuentas"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Auto conectar"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gestionar marcadores"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimizar al ingresar automáticamente"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Mostrar estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1719
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Título:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Configuración del servicio PEP"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Configurar"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Propiedades</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Configuración</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gestionar perfiles del Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Contraseña: "
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "_Host del Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "_Puerto del Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Usar prox_y HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Usar aut_entificación del proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "URL _BOSH:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Nombre: "
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Nombre"
 
-#. # means number
-#: ../data/glade/message_window.glade.h:1 ../src/dialogs.py:3937
-msgid "#"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:2
-msgid "*"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:3
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "1"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-msgid "2"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:6
-msgid "3"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:7
-msgid "4"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-msgid "5"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:9
-msgid "6"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:10
-msgid "7"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:11
-msgid "8"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "9"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Añade éste contacto al roster (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:14
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Añadir este salón a marcadores (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:15
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Navegar en el histórico de la conversación (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:16
-msgid "Change the room's subject (Alt+T)"
-msgstr "Cambiar el tema del salón (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:17
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Cambiar tu _alias (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:18
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Invitar contactos a esta conversación (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:19
-msgid "Mic volume:"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:20
-msgid "Send a file (Ctrl+F)"
-msgstr "Enviar un archivo (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:21
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Mostrar una lista de emoticonos (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:22
-msgid "Show a list of formattings"
-msgstr "Mostrar una lista de formateos"
-
-#: ../data/glade/message_window.glade.h:23
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Muestra un menú de funciones avanzadas (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:24
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Muestra el perfil del contacto (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:25
-msgid "Sound volume:"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:26
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:27
-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/glade/message_window.glade.h:29
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Enviar"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor de configuración avanzada</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Programas</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
 msgid "<b>Audio</b>"
 msgstr "<b>Acciones</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Estado automático</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Apariencia de la conversación</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../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>"
 
-#: ../data/glade/preferences_window.glade.h:7
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notificación del estado de la conversación</b>"
 
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
 msgid "<b>Connection</b>"
 msgstr "<b>Condiciones</b>"
 
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Fuente</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opciones de GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensajes de estado predefinidos</b>"
 
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<i>Privacidad</i>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Roster Appearance</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Mensajes de estado</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Temas</b>"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:20
 #, fuzzy
 msgid "<b>Video</b>"
 msgstr "<b>Medio:</b>"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificationes Visuales</b>"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/gui/preferences_window.ui.h:22
 msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: ../data/glade/preferences_window.glade.h:25
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Todos los estados de chat\n"
-"Sólo componiendo\n"
-"Desactivado"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Todos los estados"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../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"
+
+#: ../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."
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Permitir sonido cuando estoy ocupado"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Ausente"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Preguntar mensaje de estado cuando esté: "
 
-#: ../data/glade/preferences_window.glade.h:32 ../src/features_window.py:108
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
-msgstr ""
-"Autodetectar en cada inicio de Gajim\n"
-"Siempre usar las aplicaciones por defecto de GNOME\n"
-"Siempre usar las apliacciones por defecto de KDE\n"
-"Siempre usar las aplicaciones por defecto de Xfce\n"
-"Personalizado"
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "C_onectar al inicio de Gajim"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Mensaje de conversación:"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Comprobar al inicio si Gajim es el cliente de Jabber por defecto"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Componiendo"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Configurar colores y fuentes de la interfaz"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Mensaje de conversación:"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nombre de contacto"
 
-#: ../data/glade/preferences_window.glade.h:45
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Personalizado"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
 msgstr ""
-"Roster desacoplado con conversaciones desacopladas\n"
-"Roster desacoplado con conversaciones independientes\n"
-"Ventana independiente para todo\n"
-"Roster desacoplado con conversaciones agrupadas por cuenta\n"
-"Roster desacoplado con conversaciones agrupadas por tipo"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Deshabilitado"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Mostrar la _actividad de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Mostrar detalles _extra en los correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Mostrar _ajustes de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostrar en el roster los a_vatares de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Mostrar estad_o de ánimo de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostrar en el roster los _mensajes de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../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 "
@@ -1968,7 +1744,7 @@ msgstr ""
 "conversación que puedas tener con un contacto. Aquí puedes especificar qué "
 "estados de conversación quieres que se muestren en las ventanas."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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 "
@@ -1978,7 +1754,7 @@ msgstr ""
 "conversación que puedas tener con un contacto. Aquí puedes especificar qué "
 "estados de conversación enviar a la potra parte."
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../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"
@@ -1986,11 +1762,11 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Oculta los botones en las ventanas de conversación."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1998,7 +1774,7 @@ msgstr ""
 "Si está marcado, Gajim permitirá a otros detectar el sistema operativo que "
 "estás usando"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -2006,14 +1782,14 @@ msgstr ""
 "Si está marcado, Gajim también incluirá información acerca del remitente de "
 "los nuevos correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Si está marcado, Gajim cambiará el estado a Ausente cuando el ordenador no "
 "esté en uso"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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"
@@ -2021,7 +1797,7 @@ msgstr ""
 "Si está marcado, Gajim cambiará el estado a no disponible cuando el "
 "ordenador ya no se use"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2029,7 +1805,7 @@ msgstr ""
 "Si está marcado, Gajim mostrará los avatares de los contactos en el roster y "
 "grupos de conversación"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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"
@@ -2037,26 +1813,34 @@ msgstr ""
 "Si está marcado, Gajim mostrará los mensajes de estado de los contactos bajo "
 "el nombre de contacto en el roster y grupos de conversación"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará la actividad de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/gui/preferences_window.ui.h:70
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará el estado de ánimo de los contactos en el "
 "roster"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará los ajustes de los contactos en el roster"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../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 "
@@ -2066,7 +1850,7 @@ msgstr ""
 "ventanas de conversación. Si no se definió ningún idioma vía botón derecho "
 "en el campo de entrada, será usado el idioma por defecto."
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../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 "
@@ -2076,7 +1860,7 @@ msgstr ""
 "autorizados. Úsalo con precaución ya que bloqueará todos los mensajes de "
 "cualquier contacto que no esté en tu lista de contactos."
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../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 "
@@ -2086,7 +1870,7 @@ msgstr ""
 "cuenta que usando cifrado E2E, la parte remota tiene que aceptar al "
 "ingresar, o los mensajes no serán registrados."
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2094,7 +1878,7 @@ msgstr ""
 "Si está marcado, Gajim mostrará una notificación cuando se reciba un nuevo "
 "correo vía GMail"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../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, "
@@ -2104,7 +1888,7 @@ msgstr ""
 "un contacto de MSN tendrá el icono de msn equivalente para su estado en "
 "línea, ausente, ocupado, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../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."
@@ -2112,7 +1896,7 @@ msgstr ""
 "Si está habilitado, Gajim no preguntará un mensaje de estado. Será usado el "
 "mensaje por defecto especificado."
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2120,84 +1904,102 @@ msgstr ""
 "Si no está deshabilitado, Gajim reemplazará emoticonos ascii ':)' por su "
 "equivalente en iconos gráficos estáticos o animados"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "R_egistrar conversación cifrada"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Hacer compacta la ventana de mensajes"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Gestio_nar..."
 
-#: ../data/glade/preferences_window.glade.h:80
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Nunca\n"
-"Sólamente cuando haya eventos pendientes\n"
-"Siempre"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Notificaciones"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Notif_icarme de los contactos que se conecten"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cuand un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notificarme"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Notificar de nuevos correos de _GMail"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nunca\n"
+"Sólamente cuando haya eventos pendientes\n"
+"Siempre"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Eventos personales"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../data/glade/preferences_window.glade.h:89
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
-"Emerger aviso\n"
-"Notificarmelo\n"
-"Mostrar sólo en roster"
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Emerger"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
 #, fuzzy
 msgid "STUN server:"
 msgstr "Servidor:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Sólo mostrar en la _lista de contactos"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Mostrar systray:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Cone_ctar"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2205,27 +2007,27 @@ msgstr ""
 "Algunos mensajes pueden incluir contenido enriquecido (formato, colores "
 "etc). Si está marcado, Gajim mostrará el mensaje en bruto."
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: ../data/glade/preferences_window.glade.h:99 ../src/config.py:384
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Set de _iconos de estado:"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Estilo"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "Te_ma:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2237,7 +2039,7 @@ msgstr ""
 "$S será reemplazado por el anterior mensaje de estado\n"
 "$T será reemplazado por la activación del auto-ausente"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../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"
@@ -2249,375 +2051,382 @@ msgstr ""
 "$S será reemplazado por el anterior mensaje de estado\n"
 "$T será reemplazado por la activación del auto-no disponible"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Usar iconos de _transporte"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Usar pre_definido del sistema"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video input device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:117
 msgid "Video output device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Cuando se recibe un nuevo evento:"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Mensaje de error: %s"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Ant_es del alias:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Ausente tras:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Mostrar notificaciones de estado de la conversación:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Emoticonos:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "A_dministrador de archivos:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorar contenido enriquecido en mensajes entrantes"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:126
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "_No disponible tras:"
 
-#: ../data/glade/preferences_window.glade.h:127
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:128
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Restablecer colores por defecto"
 
-#: ../data/glade/preferences_window.glade.h:129
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "Enviar notificaciones del estado de la conversación:"
 
-#: ../data/glade/preferences_window.glade.h:130
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "Men_saje de estado:"
 
-#: ../data/glade/preferences_window.glade.h:131
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "Resaltado de _URL:"
 
-#: ../data/glade/preferences_window.glade.h:132
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Comportamiento de la ventana:"
 
-#: ../data/glade/preferences_window.glade.h:133
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "en _grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:134
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "en _roster"
 
-#: ../data/glade/preferences_window.glade.h:135
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutos"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Listas de privacidad:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Añadir / Editar una regla</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Lista de reglas</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista de privacidad</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Activo para esta sesión"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Activo en cada inicio"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Todos"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "todos por suscripción"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "ID de Jabber:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Orden:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3233
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Lista de privacidad"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "todos por suscripción"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "todos en el grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ninguno\n"
-"ambos\n"
-"de\n"
-"a"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Ambos"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "De"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "uno"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "dos"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "para enviarme mensajes"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "para enviarme consultas"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "para enviarme el estado"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "para ver mi estado"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../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/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../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/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../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/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../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/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Departamento:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Familia:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Nombre completo</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Apodo:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../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>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Medio:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Nombre:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Alias:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../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/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefijo:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:331
+#: ../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/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Estado:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Calle:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sufijo:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Acerca de"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Click para definir tu avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Información personal"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>¿Qué quieres hacer?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Eliminar la _cuenta únicamente de Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Eliminar la cuenta de Gajim y del _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5371 ../src/roster_window.py:5498
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2625,188 +2434,143 @@ msgstr ""
 "<b>alguien@algunsitio.com</b> quiere <b>añadir</b> algunos contactos a tu "
 "roster."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../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/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Intercambio de elementos del roster"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "_Añadir contacto..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Carac_terísticas"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Transferencias"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Preguntas frecuentes (en línea)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Ayuda online"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Perfil, A_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Mostrar sólo contactos _activos"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Mostrar Trans_portes"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos desconectados"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Mostrar _roster"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Cuentas"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Acciones"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Contenidos"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1466
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Preferencias"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Salir"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "E_nviar mensaje..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Ver"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../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/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Buscar"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Añadir un _Contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5510
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Información"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1317
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "I_r"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Dirección:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registrar en"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "De:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Responder a este mensaje:"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Enviar"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Enviar mensaje y cerrar ventana"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "A:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Enviar y Cerrar"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_torizar"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2814,175 +2578,190 @@ msgstr ""
 "Denegar autorización al contacto para que no pueda saber cuándo estás "
 "conectado"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Petición de adición"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Selecciona la cuenta con la que quieres sincronizar"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sincronizar: seleccionar contactos"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Silenciar sonidos"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enviar mensaje"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos los _eventos pendientes"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Es_tado"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Grupos de charla"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Pregunta:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Cliente:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Hora del contacto:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>ID de Jabber:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Recurso:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Estado:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Suscripción:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Sistema:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Avatar configurado:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Información"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Más"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Avatar del usuario:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Fuente</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfico de Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada de XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activar"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IC"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Presencia"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modificar cuenta..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "JID local"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Personal"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Un cliente de Jabber en GTK"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Cancelar información"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "El servicio envió información malformada"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "El servicio cambió el identificador de la sesión"
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "El servicio devolvió un error"
 
@@ -3007,7 +2786,7 @@ msgstr "Entero"
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Color"
 
@@ -3144,84 +2923,84 @@ msgstr "Sueco"
 msgid "Chinese (Ch)"
 msgstr "Chino (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Lenguaje del corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Tachado"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Fuente"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Limpiar formato"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "¿Enviar fichero?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1420 ../src/chat_control.py:1883
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "Cifrado GPG habilitado"
 
 #. Add to roster
-#: ../src/chat_control.py:1445 ../src/common/contacts.py:157
-#: ../src/common/contacts.py:274 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:243 ../src/dialogs.py:1060 ../src/dialogs.py:1972
-#: ../src/dialogs.py:2001 ../src/gui_interface.py:606
+#: ../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:1575 ../src/roster_window.py:1577
-#: ../src/roster_window.py:1892 ../src/roster_window.py:3195
-#: ../src/roster_window.py:3221
+#: ../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
 msgid "Not in Roster"
 msgstr "no está en el roster"
 
-#: ../src/chat_control.py:1489
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Este contacto no soporta transferencia de archivos"
 
-#: ../src/chat_control.py:1492
+#: ../src/chat_control.py:1522
 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:1573
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1751
+#: ../src/chat_control.py:1812
 #, 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:1863 ../src/dialogs.py:4619
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Ninguna clave GPG asignada"
 
-#: ../src/chat_control.py:1864
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3229,50 +3008,50 @@ msgstr ""
 "No se ha asignado ninguna clave GPG a este contacto. Por tanto no podrás "
 "cifrar mensajes con GPG."
 
-#: ../src/chat_control.py:1873
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "Cifrado GPG deshabilitado"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "La sesión SERÁ registrada"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "La NO SERÁ registrada"
 
 #. encryption %s active
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "es"
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "NO es"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1920
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:1920
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "no será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "y autentificado"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1928
+#: ../src/chat_control.py:1992
 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:1935
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3281,23 +3060,23 @@ msgstr ""
 "%(type)s cifrado %(status)s activo %(authenticated)s.\n"
 "Tu sesión %(logged)s guardada."
 
-#: ../src/chat_control.py:2075
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "La negociación de la sesión ha sido cancelada"
 
-#: ../src/chat_control.py:2084
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Esta sesión está cifrada"
 
-#: ../src/chat_control.py:2087
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " y SERÁ registrada"
 
-#: ../src/chat_control.py:2089
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " y NO SERÁ registrada"
 
-#: ../src/chat_control.py:2094
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3305,25 +3084,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:2096
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "Cifrado E2E desactivado"
 
-#: ../src/chat_control.py:2133 ../src/chat_control.py:2146
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "El siguiente mensaje NO fue cifrado"
 
-#: ../src/chat_control.py:2139
+#: ../src/chat_control.py:2203
 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:2408
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
 
-#: ../src/chat_control.py:2409
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3331,15 +3110,15 @@ msgstr ""
 "Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
 "perderá."
 
-#: ../src/chat_control.py:2552 ../src/common/connection_handlers.py:2158
-#: ../src/common/connection_handlers.py:2204
-#: ../src/common/connection_handlers.py:2398
-#: ../src/common/connection_handlers.py:2543 ../src/common/connection.py:432
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Error en la base de datos"
 
-#: ../src/chat_control.py:2553
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3348,7 +3127,7 @@ msgstr ""
 "No se pudo leer el archivo de base de datos (%s). Intenta repararlo o "
 "elimínalo (se perderá todo el histórico)."
 
-#: ../src/chat_control.py:2791
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s está ahora %(status)s"
@@ -3357,23 +3136,33 @@ msgstr "%(name)s está ahora %(status)s"
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/check_paths.py:122 ../src/common/check_paths.py:133
-#: ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "creando base de datos de registros"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:123 ../src/common/check_paths.py:134
-#: ../src/common/check_paths.py:141 ../src/common/check_paths.py:149
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
-#: ../src/common/check_paths.py:148
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:164
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
@@ -3436,10 +3225,10 @@ 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:136
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1579 ../src/roster_window.py:1581
-#: ../src/roster_window.py:5139
+#: ../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
 msgid "Groupchats"
 msgstr "Grupos de charla"
 
@@ -3554,9 +3343,9 @@ msgstr ""
 "Lista (separada por espacios) de filas (cuentas y grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:487
-#: ../src/common/optparser.py:283 ../src/common/optparser.py:479
-#: ../src/common/optparser.py:513 ../src/gui_interface.py:3231
+#: ../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
 msgid "default"
 msgstr "por defecto"
 
@@ -3846,12 +3635,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:228
+#: ../src/common/config.py:229
 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:229
+#: ../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."
@@ -3859,7 +3648,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:230
+#: ../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."
@@ -3867,7 +3656,7 @@ msgstr ""
 "Si es False, Gajim nunca más mostrará la línea de estado cuando un contacto "
 "cambie su estado o su mensaje de estado"
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3881,30 +3670,30 @@ msgstr ""
 "mensajes de estado. Si es \"in_and_out\", Gajim sólo mostrará las entradas y "
 "salidas en el grupo de conversación."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 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:234
+#: ../src/common/config.py:235
 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:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "No mostrar avatar para el transporte en sí mismo"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "No mostrar roster en la barra de tareas."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3913,7 +3702,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:241
+#: ../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 "
@@ -3924,7 +3713,7 @@ msgstr ""
 "detener el envío de información sha en el grupo de conversación."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3944,31 +3733,31 @@ msgstr ""
 "'pertype' - Cada tipo de mensaje (p.ej. conversaciones vs. grupos de charla) "
 "se envian a una ventana específica."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Esconde los botones en las ventanas de conversación"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta el banner en una ventana de grupo de charla"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 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:250
+#: ../src/common/config.py:251
 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:251
+#: ../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."
@@ -3976,15 +3765,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentar cuando se use una combinación de alias consecutivos."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Desplazamiento suave del mensaje en las ventanas de conversación"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3992,13 +3781,13 @@ msgstr ""
 "Lista de colores, separados por \":\", que serán usados para colorear alias "
 "en los grupos de charla."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4006,7 +3795,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:257
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4015,7 +3804,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:258
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4024,7 +3813,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: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 "
@@ -4034,7 +3823,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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4042,7 +3831,7 @@ msgstr ""
 "Si es True, Gajim usará Gnome Keyring (si está disponible) para almacenar "
 "las contraseñas de la cuenta."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -4050,7 +3839,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:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4058,7 +3847,7 @@ msgstr ""
 "Si es True, Gajim mostrará el número de contactos totales y en línea en los "
 "títulos de la cuenta y los grupos."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4066,7 +3855,7 @@ msgstr ""
 "Puede estar vacío, 'chat' o 'normal. Si no está vacío, tratará todos los "
 "mensajes entrantes como si fueran de este tipo"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4074,7 +3863,7 @@ msgstr ""
 "Si es True, Gajim mostrará y seleccionará el contacto que te envió el último "
 "mensaje, si la ventana de conversación no ha sido abierta aún."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -4082,11 +3871,11 @@ msgstr ""
 "Si es True, Gajim convertirá la cadena entre $$ y $$ a una imagen usando "
 "dvips y convert antes de insertarla en una ventana de conversación."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tiempo de inactividad necesario antes de cerrar la ventana de estado."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4094,7 +3883,7 @@ msgstr ""
 "Número máximo de líneas mostradas en las conversaciones. Las más antiguas "
 "serán limpiadas."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4102,11 +3891,11 @@ msgstr ""
 "Si es True, las ventanas de notificación del deminio notificador serán "
 "adjuntadas al área de notificación."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Elige intervalo entre 2 comprobaciones de inactividad."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4114,7 +3903,7 @@ msgstr ""
 "Cambiar el valor para cambiar el tamaño de las fórmulas latex visualizadas. "
 "El mayor es el más grande."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4122,7 +3911,7 @@ msgstr ""
 "Combinaciones de uri válidas. Sólo las combinaciones de esta lista serán "
 "aceptadas como uri \"real\"."
 
-#: ../src/common/config.py:272
+#: ../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!"
@@ -4131,21 +3920,33 @@ msgstr ""
 "cuando se establezca conexión con una cuenta. ADVERTENCIA: ¡Ésto puede "
 "causar el envío de muchas peticiones!"
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:279
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:284
+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."
@@ -4153,7 +3954,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:299
+#: ../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"
@@ -4162,38 +3963,38 @@ msgstr ""
 "invisible. NOTA: esta opción se usa sólo si restore_last_status está "
 "desactivado"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:305
 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:302
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:308
 #, 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:306
+#: ../src/common/config.py:311
 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:308
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Activar cifrado ESessions para esta cuenta."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:314
 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:310
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4201,30 +4002,38 @@ msgstr ""
 "Lista ordenada (separada por espacios) de tipos de conexión para probar. "
 "Puede contener tls, ssl o plain"
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Muestra un aviso antes de enviar la contraseña a través de una conexión de "
 "texto plano."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:317
 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:314
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Muestra un aviso antes de enviar la contraseña a través de una conexión de "
+"texto plano."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista separada por espacios de errores ssl a ignorar."
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Espacio en blanco enviado tras inactividad"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "Ping XMPP enviado tras inactividad"
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4233,11 +4042,11 @@ msgstr ""
 "actividad antes de  intentar reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:332
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4245,15 +4054,15 @@ 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:349
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Contestar peticiones recibidas"
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Enviar peticiones recibidas"
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4261,11 +4070,16 @@ msgstr ""
 "Cuando se negocie una sesión cifrada, ¿Gajim debería asumir que quieres que "
 "tus mensajes sean registrados?"
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "¿Está OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4273,101 +4087,101 @@ msgstr ""
 "¿Debería Gajim iniciar automáticamente una sesión cifrada con este contacto "
 "cuando sea posible?"
 
-#: ../src/common/config.py:423 ../src/common/config.py:426
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Lenguaje en el que queremos comprobar errores ortográficos"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "estado separado por espacios o all"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:434 ../src/common/config.py:436
-#: ../src/common/config.py:437 ../src/common/config.py:440
-#: ../src/common/config.py:441
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' o ''"
 
-#: ../src/common/config.py:447 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:449 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:451 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:452
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:452
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:453
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:453
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Estoy fuera disfrutando la vida"
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Estoy disponible"
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Estoy libre para hablar"
 
-#: ../src/common/config.py:466 ../src/config.py:1534
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "No estoy disponible."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "No molestar."
 
-#: ../src/common/config.py:469 ../src/common/config.py:470
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "¡Adiós!"
 
-#: ../src/common/config.py:480
+#: ../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."
@@ -4376,58 +4190,50 @@ msgstr ""
 "palabras de muc_highlight_words, o cuando un mensaje de grupo de charla "
 "contiene tu alias."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sonido a reproducir cuando llega cualquier mensaje MUC"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:297
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:494 ../src/common/optparser.py:283
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:502
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "No se puede cargar el módulo idle"
 
-#: ../src/common/connection_handlers.py:257
-msgid "Wrong host"
-msgstr "Host erróneo"
-
-#: ../src/common/connection_handlers.py:258
-msgid "Invalid local address? :-O"
-msgstr "¿Dirección local no válida? :-O"
-
-#: ../src/common/connection_handlers.py:723
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "La información de registro para el transporte %s no llegó a tiempo"
 
-#: ../src/common/connection_handlers.py:730
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registro realizado con éxito"
 
-#: ../src/common/connection_handlers.py:731
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registro con el agente %s realizado con éxito"
 
-#: ../src/common/connection_handlers.py:733
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Falló el registro"
 
-#: ../src/common/connection_handlers.py:733
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4435,39 +4241,39 @@ msgstr ""
 "El registro con el agente %(agent)s falló con el error %(error)s: %"
 "(error_msg)s"
 
-#: ../src/common/connection_handlers.py:1037
-#: ../src/common/connection_handlers.py:2156
-#: ../src/common/connection_handlers.py:2202
-#: ../src/common/connection_handlers.py:2396
-#: ../src/common/connection_handlers.py:2541 ../src/common/connection.py:430
-#: ../src/gajim.py:353
+#: ../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
 msgid "Disk Write Error"
 msgstr "Error de escritura en disco"
 
-#: ../src/common/connection_handlers.py:1260 ../src/common/connection.py:1431
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Invisibilidad no soportada"
 
-#: ../src/common/connection_handlers.py:1261 ../src/common/connection.py:1432
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "La cuenta %s no soporta invisibilidad."
 
-#: ../src/common/connection_handlers.py:1977 ../src/common/connection.py:245
-#: ../src/config.py:1996 ../src/config.py:2005 ../src/config.py:2064
-#: ../src/config.py:3416 ../src/dataforms_widget.py:577 ../src/dialogs.py:2779
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:1398
 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:2159
-#: ../src/common/connection_handlers.py:2205
-#: ../src/common/connection_handlers.py:2399
-#: ../src/common/connection_handlers.py:2544 ../src/common/connection.py:433
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4477,7 +4283,7 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) o elimínalo (se perderá todo el "
 "histórico)."
 
-#: ../src/common/connection_handlers.py:2251
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alias no permitido: %s"
@@ -4485,76 +4291,76 @@ msgstr "Alias no permitido: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2346
-#: ../src/common/connection_handlers.py:2354
-#: ../src/common/connection_handlers.py:2360
-#: ../src/common/connection_handlers.py:2363
-#: ../src/common/connection_handlers.py:2366
-#: ../src/common/connection_handlers.py:2370 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "No se pudo entrar al grupo de charla"
 
-#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2355
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Estás baneado del grupo de charla %s."
 
-#: ../src/common/connection_handlers.py:2361
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "El grupo de charla %s no existe."
 
-#: ../src/common/connection_handlers.py:2364
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "La creación de grupos de charla está restringida."
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Tu alias registrado podría estar en uso en el grupo de charla %s."
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "No estás en la lista de miembros del grupo de charla %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "El salón ha sido destruido"
 
-#: ../src/common/connection_handlers.py:2422
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Puedes unirte a este salón en su lugar: %s"
 
-#: ../src/common/connection_handlers.py:2453
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2474
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos ahora suscritos a %s"
 
-#: ../src/common/connection_handlers.py:2476
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "petición de eliminación de suscripción de %s"
 
-#: ../src/common/connection_handlers.py:2478
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ya no estamos suscritos a %s"
 
-#: ../src/common/connection_handlers.py:2673
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4692,27 +4498,27 @@ msgstr "El uso de la clave no incluye la firma de certificados"
 msgid "Application verification failure"
 msgstr "Falló la verificación de la aplicación"
 
-#: ../src/common/connection.py:246 ../src/dialogs.py:2780
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:268
+#: ../src/common/connection.py:271
 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:271
+#: ../src/common/connection.py:274
 #, 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:319
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Este mensaje está *cifrado* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:420
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4721,80 +4527,80 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:770
+#: ../src/common/connection.py:789
 #, 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:771
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:783
+#: ../src/common/connection.py:802
 #, 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:817
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "El servidor %s provee un formulario de registro diferente"
 
-#: ../src/common/connection.py:830
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Error SSL desconocido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:845
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Respuesta no válida"
 
-#: ../src/common/connection.py:846
+#: ../src/common/connection.py:865
 #, 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:1127 ../src/common/connection.py:1256
-#: ../src/common/connection.py:1735
-#: ../src/common/zeroconf/connection_zeroconf.py:191
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:1128 ../src/gui_interface.py:700
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: ../src/common/connection.py:1133
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "El servidor respondió: %s"
 
-#: ../src/common/connection.py:1146
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Falló la conexión al proxy"
 
-#: ../src/common/connection.py:1177 ../src/common/connection.py:1236
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "No se puede conectar a la cuenta %s"
 
-#: ../src/common/connection.py:1178 ../src/common/connection.py:1237
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1203
+#: ../src/common/connection.py:1222
 #, 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:1206
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4803,7 +4609,7 @@ msgstr ""
 "\n"
 "Error SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1208
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4812,25 +4618,25 @@ msgstr ""
 "\n"
 "Error SSL desconocido: %d"
 
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:1288
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:1290
+#: ../src/common/connection.py:1309
 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:1354
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Error eliminando la lista de privacidad"
 
-#: ../src/common/connection.py:1355
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4839,46 +4645,46 @@ 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:1601
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Contacto enviado: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1604
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Contactos enviados:"
 
-#: ../src/common/connection.py:1769 ../src/common/connection.py:1792
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "No conseguido debido al estado invisible"
 
-#: ../src/common/connection.py:2196
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Falló el registro"
 
-#: ../src/common/connection.py:2197
+#: ../src/common/connection.py:2220
 #, 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:134 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:606
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/common/contacts.py:138 ../src/common/contacts.py:357
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1463 ../src/gui_interface.py:411
-#: ../src/roster_window.py:848 ../src/roster_window.py:1500
-#: ../src/roster_window.py:1571 ../src/roster_window.py:1573
-#: ../src/roster_window.py:1731
+#: ../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
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:365
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "No está en el roster"
 
@@ -4887,15 +4693,25 @@ msgstr "No está en el roster"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
+#: ../src/common/dbus_support.py:54
+#, 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
+#, 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"
+
 #: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "No se pudo leer la base de datos."
@@ -5087,245 +4903,249 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "¡Fin de semana!"
 
-#: ../src/common/helpers.py:149
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Caracter no válido en el nombre de usuario."
 
-#: ../src/common/helpers.py:154
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Se requiere la dirección del servidor."
 
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Carácter no válido en el nombre del host."
 
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Carácter no válido en el recurso."
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_No Disponible"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Libre para hablar"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Libre para hablar"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "En líne_a"
 
-#: ../src/common/helpers.py:224 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "En línea"
 
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:239
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Tiene errores"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Ninguna"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "_Añadir"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ninguno"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:302
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Miembro"
 
-#: ../src/common/helpers.py:343
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "está prestando atención a la conversación"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "está haciendo algo más"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:349
 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:350
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "ha parado de escribir"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "ha cerrado la ventana de chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:617
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr ""
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:620
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr ""
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:624
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr ""
 
 #. MB means megabyte
-#: ../src/common/helpers.py:627
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr ""
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:631
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr ""
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:634
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr ""
 
 #. B means bytes
-#: ../src/common/helpers.py:637
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr ""
 
-#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1112
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1118
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " del salón %s"
 
-#: ../src/common/helpers.py:1121 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " del usuario %s"
 
-#: ../src/common/helpers.py:1123
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " de %s"
 
-#: ../src/common/helpers.py:1130 ../src/common/helpers.py:1137
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1170
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/jingle_rtp.py:98
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuración del salón"
 
-#: ../src/common/jingle_rtp.py:99
+#: ../src/common/jingle_rtp.py:107
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5337,19 +5157,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:285
+#: ../src/common/jingle_rtp.py:299
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:288
+#: ../src/common/jingle_rtp.py:302
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:317
+#: ../src/common/jingle_rtp.py:331
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:325
+#: ../src/common/jingle_rtp.py:339
 msgid "video output"
 msgstr ""
 
@@ -5363,17 +5183,74 @@ msgstr "Error ejecutando \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s no es un nivel de registro válido"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Mensajes por defecto"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Tamaño: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:52
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para lectura"
 
-#: ../src/common/optparser.py:292 ../src/common/optparser.py:293
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:372
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migrando la base de datos de registros a los índices"
 
@@ -6010,19 +5887,19 @@ msgstr "Estudiando"
 msgid "Writing"
 msgstr "Escribiendo"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Artista desconocido"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Título desconocido"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Recurso desconocido"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6032,12 +5909,12 @@ msgstr ""
 "de <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:90
+#: ../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:91
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -6053,11 +5930,11 @@ msgid ""
 msgstr ""
 "[Esto es parte de una sesión cifrada. Si ves este mensaje, algo fue mal.]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:180
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Error de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6066,44 +5943,44 @@ msgstr ""
 "%s\n"
 "La mensajería de enlace local podría no funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 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:201
-#: ../src/common/zeroconf/connection_zeroconf.py:205
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "No se pudo iniciar servicio local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "No se pudo enlazar al puerto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:206
-#: ../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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 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:284
-#: ../src/common/zeroconf/connection_zeroconf.py:295
-#: ../src/common/zeroconf/connection_zeroconf.py:309
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, 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:326
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Tu mensaje no pudo ser enviado."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:336
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 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:361
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6115,24 +5992,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error añadiendo el servicio. %s"
 
-#: ../src/config.py:164 ../src/config.py:622
-msgid "Disabled"
-msgstr "Deshabilitado"
-
-#: ../src/config.py:390
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Mensajes por defecto"
 
-#: ../src/config.py:399
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../src/config.py:690 ../src/dialogs.py:1364
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "No está disponible el diccionario para el idioma %s"
 
-#: ../src/config.py:691
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6141,73 +6014,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:1149
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:1149
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
 #. Name column
-#: ../src/config.py:1450 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3012 ../src/disco.py:830 ../src/disco.py:1689
-#: ../src/disco.py:1991 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1543
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "¿Reconectar ahora?"
 
-#: ../src/config.py:1544
+#: ../src/config.py:1586
 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:1676 ../src/config.py:1801
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP no es usable en este ordenador"
 
-#: ../src/config.py:1841 ../src/config.py:1885
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Eventos sin leer"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Lee todos los eventos pendientes antes de eliminar esta cuenta."
 
-#: ../src/config.py:1868
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Has abierto una conversación con la cuenta %s"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1918
 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:1881 ../src/config.py:2404 ../src/config.py:2438
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1882
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1886
+#: ../src/config.py:1935
 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:1892
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "El nombre de la cuenta ya está en uso"
 
-#: ../src/config.py:1893
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6215,147 +6088,147 @@ msgstr ""
 "Este nombre ya está en uso por otra de tus cuentas. Por favor, escoge otro "
 "nombre."
 
-#: ../src/config.py:1897 ../src/config.py:1901
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1898
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1902
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1977
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Renombrar cuenta"
 
-#: ../src/config.py:1978
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduce un nuevo nombre para la cuenta %s"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2055
 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:2214 ../src/config.py:3462
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:2215 ../src/config.py:3463
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:2236
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:2271
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Selección de clave OpenPGP"
 
-#: ../src/config.py:2272
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2329
 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:2287 ../src/dialogs.py:2030 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:476 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:2288
+#: ../src/config.py:2337
 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:2292
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Tu servidor no soporta vCard"
 
-#: ../src/config.py:2293
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Tu servidor no puede guardar tu información personal."
 
-#: ../src/config.py:2405 ../src/config.py:2439
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "La cuenta local ya existe."
 
-#: ../src/config.py:2411
+#: ../src/config.py:2461
 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:2566
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2568
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
 #. list at the beginning
-#: ../src/config.py:2604
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Lista de expulsión"
 
-#: ../src/config.py:2605
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Lista de miembros"
 
-#: ../src/config.py:2606
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Lista de propietarios"
 
-#: ../src/config.py:2607
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2656 ../src/disco.py:837 ../src/history_manager.py:201
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2666
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2673
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Alias"
 
-#: ../src/config.py:2679
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Puesto"
 
-#: ../src/config.py:2706
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Expulsando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2708
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6363,11 +6236,11 @@ msgstr ""
 "<b>¿A quién quieres expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Añadiendo miembro..."
 
-#: ../src/config.py:2711
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6375,11 +6248,11 @@ msgstr ""
 "<b>¿A quién quieres hacer miembro?</b>\n"
 "\n"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Añadiendo propietario..."
 
-#: ../src/config.py:2714
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6387,11 +6260,11 @@ msgstr ""
 "<b>¿A quién quieres hacer propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2716
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Añadiendo administrador..."
 
-#: ../src/config.py:2717
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6399,7 +6272,7 @@ msgstr ""
 "<b>¿A quién quieres hacer administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2718
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6416,59 +6289,87 @@ msgstr ""
 "usuario@dominio, dominio/ recurso, o una dirección conteniendo un "
 "subdominio)."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2841 ../src/gui_interface.py:1097
-#: ../src/gui_interface.py:1192
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Emoticonos desactivados"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2842 ../src/gui_interface.py:1172
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2843 ../src/gui_interface.py:1192
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2852
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2853
+#: ../src/config.py:2913
 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:2951
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Falló la conexión al proxy"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "¿Qué quieres hacer?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Eliminar la _cuenta únicamente de Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2951
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2952
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Entrar y salir sólamente"
 
-#: ../src/config.py:2953
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "Ninguno"
 
-#: ../src/config.py:3023
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Nuevo grupo de charla"
 
-#: ../src/config.py:3056
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:3057
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6476,27 +6377,27 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:3175 ../src/dialogs.py:1828
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Alias no válido"
 
-#: ../src/config.py:3176 ../src/config.py:3190 ../src/config.py:3204
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Carácter no permitido"
 
-#: ../src/config.py:3189 ../src/config.py:3438
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Servidor no válido"
 
-#: ../src/config.py:3203
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Salón no válido"
 
-#: ../src/config.py:3355
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:3356 ../src/config.py:3362
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6507,32 +6408,32 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:3361
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:3399
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:3401
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:3439
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifica un servidor donde te quieras registrar."
 
-#: ../src/config.py:3495 ../src/gui_interface.py:1841
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "El certificado ya está en el archivo"
 
-#: ../src/config.py:3496 ../src/gui_interface.py:1842
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3566
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6547,7 +6448,7 @@ msgstr ""
 "Error SSL: %(error)s\n"
 "¿Aún quieres conectar a este servidor?"
 
-#: ../src/config.py:3572 ../src/gui_interface.py:1866
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6558,63 +6459,63 @@ msgstr ""
 "Huella SHA1 del certificado:\n"
 "%s"
 
-#: ../src/config.py:3599 ../src/config.py:3626
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:3693
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:3694
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/config.py:3847
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3890
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Primer mensaje recibido"
 
-#: ../src/config.py:3891
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Primer mensaje recibido focalizado"
 
-#: ../src/config.py:3893
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Primer mensaje recibido desfocalizado"
 
-#: ../src/config.py:3894
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Nombre de contacto"
 
-#: ../src/config.py:3895
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:3896
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Mensaje enviado"
 
-#: ../src/config.py:3897
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Resaltado de mensaje de grupo de charla"
 
-#: ../src/config.py:3898
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Mensaje de grupo de charla recibido"
 
-#: ../src/config.py:3899
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Correo de GMail recibido"
 
-#: ../src/conversation_textview.py:598
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6624,7 +6525,7 @@ msgstr ""
 "recibido por el extremo remoto. Si este icono permanece\n"
 "mucho tiempo, probablemente el mensaje se haya perdido."
 
-#: ../src/conversation_textview.py:617
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6632,44 +6533,44 @@ msgstr ""
 "El texto bajo esta línea es lo que ha sido dicho desde la última vez que "
 "prestaste atención a este salón de charla"
 
-#: ../src/conversation_textview.py:736
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Cita"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
-#: ../src/conversation_textview.py:777
+#: ../src/conversation_textview.py:779
 #, 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:790
+#: ../src/conversation_textview.py:792
 #, 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:793
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:799
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "_Abrir como enlace"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1285
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6677,7 +6578,7 @@ msgstr[0] "Ayer"
 msgstr[1] "Ayer"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1320 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -6783,72 +6684,72 @@ msgstr ""
 "Por favor, introduce la inforamción del contacto que quieres añadir a la "
 "cuenta %s"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "ID de Usuario no válida"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario no contiene un recurso."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "No puedes añadirte a tí mismo a tu roster."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Contacto ya presente en el roster"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto ya está listado en tu roster."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Desarrolladores actuales:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Desarrolladores anteriores:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "AGRADECIMIENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1197
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Fran Alburquerque <frank@giingo.org>"
 
-#: ../src/dialogs.py:1365
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6861,104 +6762,104 @@ msgstr ""
 "\n"
 "No se usará el resaltado de los errores de escritura"
 
-#: ../src/dialogs.py:1829 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "El alias tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:1947
+#: ../src/dialogs.py:2044
 #, 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:1950
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:2025 ../src/gui_interface.py:2576
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/dialogs.py:2031
+#: ../src/dialogs.py:2128
 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:2073
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un grupo de charla con la cuenta %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, 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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Alias no válido"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1774
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "ID de Jabber no válida para el grupo de charla"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, 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:2182 ../src/groupchat_control.py:1775
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "La ID de Jabber para el grupo de charla tiene caracteres no permitidos."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Esto no es un grupo de charla"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, 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:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sin una conexión, no puedes sincronizar tus contactos."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Esta cuentano está conectada al servidor"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6967,171 +6868,171 @@ msgstr ""
 "enviar un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2765 ../src/dialogs.py:2927
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2766 ../src/dialogs.py:2928
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "No se puede analizar \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 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:2467 ../src/notify.py:263 ../src/notify.py:499
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:2469 ../src/notify.py:271 ../src/notify.py:501
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:2471 ../src/notify.py:292 ../src/notify.py:344
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. single message
-#: ../src/dialogs.py:2471 ../src/notify.py:275 ../src/notify.py:345
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
 #. private message
-#: ../src/dialogs.py:2472 ../src/notify.py:281 ../src/notify.py:345
-#: ../src/notify.py:504
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:2472 ../src/gui_interface.py:1305 ../src/notify.py:513
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Nuevo correo-e"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1368 ../src/notify.py:506
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1273
-#: ../src/gui_interface.py:1337 ../src/notify.py:508
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1413
-#: ../src/gui_interface.py:1435 ../src/gui_interface.py:1452
-#: ../src/notify.py:510
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:2479 ../src/gui_interface.py:1416 ../src/notify.py:511
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1116 ../src/notify.py:515
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Invitación a grupo de charla"
 
-#: ../src/dialogs.py:2483 ../src/notify.py:255 ../src/notify.py:517
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Contacto cambió su estado"
 
-#: ../src/dialogs.py:2684
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Nuevo mensaje en la cuenta %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2691
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2714
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Recibido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2737
+#: ../src/dialogs.py:2880
 #, 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:2816
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2817
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2956
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Triste"
 
-#: ../src/dialogs.py:2956
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Modificar"
 
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Eliminar"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7139,146 +7040,151 @@ 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:3001 ../src/dialogs.py:3047
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Dirección"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3078
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../src/dialogs.py:3009
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:3015
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupos"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3123
+#: ../src/dialogs.py:3318
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s me sugirió añadirte en mi roster."
 
-#: ../src/dialogs.py:3137
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Añadir un _Contacto"
 
-#: ../src/dialogs.py:3174
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Elimina contacto del roster"
 
-#: ../src/dialogs.py:3227
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidad <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3231
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidad para %s"
 
-#: ../src/dialogs.py:3287
+#: ../src/dialogs.py:3482
 #, 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:3292
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orden: %(order)s, acción: %(action)s"
 
-#: ../src/dialogs.py:3336
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar una regla</b>"
 
-#: ../src/dialogs.py:3447
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Añadir una regla</b>"
 
-#: ../src/dialogs.py:3547
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listas de privacidad para %s"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Listas de privacidad"
 
-#: ../src/dialogs.py:3619
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Nombre de lista no válido"
 
-#: ../src/dialogs.py:3620
+#: ../src/dialogs.py:3815
 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:3652
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Has sido invitado a un grupo de charla"
 
-#: ../src/dialogs.py:3655
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact te ha invitado a entrar en una discusión"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3852
 #, 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:3665
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "¿Quieres aceptar la invitación?"
 
-#: ../src/dialogs.py:3728
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:3738 ../src/dialogs.py:3794
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:3743
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:3781
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:3799
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:3866
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cuando %s esté:"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Añadiendo notificación especial para %s"
 
-#: ../src/dialogs.py:3943
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:4063
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "cuando esté "
 
-#: ../src/dialogs.py:4539
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7289,19 +7195,19 @@ msgstr ""
 "\n"
 "La cadena corta de autentificación de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4542
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Ya verificaste la identidad de este contacto."
 
-#: ../src/dialogs.py:4548 ../src/dialogs.py:4632
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Identidad del contacto verificada"
 
-#: ../src/dialogs.py:4554
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Verificar de nuevo..."
 
-#: ../src/dialogs.py:4559
+#: ../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 "
@@ -7311,19 +7217,19 @@ msgstr ""
 "persona esperada, necesitas verificar su identidad haciendo click en el "
 "botón inferior."
 
-#: ../src/dialogs.py:4562 ../src/dialogs.py:4613 ../src/dialogs.py:4626
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "La identidad del contacto NO fue verificada"
 
-#: ../src/dialogs.py:4567
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:4578
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "¿Has verificado la identidad del contacto?"
 
-#: ../src/dialogs.py:4579
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7338,22 +7244,22 @@ msgstr ""
 "\n"
 "La Cadena Corta de Autentificación (CCA) de esta sesión es <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4580
+#: ../src/dialogs.py:4775
 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:4614
+#: ../src/dialogs.py:4809
 #, 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:4620
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "No se ha asignado una clave GPG a este contacto. No podrás cifrar mensajes."
 
-#: ../src/dialogs.py:4627
+#: ../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."
@@ -7362,7 +7268,7 @@ msgstr ""
 "de modo que <b>no</b> será cifrado. Usa tu cliente GPG para otorgar "
 "confianza a esta clave."
 
-#: ../src/dialogs.py:4633
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7370,52 +7276,52 @@ 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:4698
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4700
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4702
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4706
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:477
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/disco.py:553
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: ../src/disco.py:555
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/disco.py:705
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "El servicio no fue encontrado"
 
-#: ../src/disco.py:706
+#: ../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."
@@ -7423,93 +7329,97 @@ 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:710 ../src/disco.py:1046
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "El servicio no es navegable"
 
-#: ../src/disco.py:711
+#: ../src/disco.py:749
 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:750 ../src/disco.py:760
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Nombre de servidor no válido"
 
-#: ../src/disco.py:814
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar por %(address)s usando la cuenta %(account)s"
 
-#: ../src/disco.py:858
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1047
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1287
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Ejecutar comando"
 
-#: ../src/disco.py:1297 ../src/disco.py:1468
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1509
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1699
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1707
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Descripción"
 
 #. Id column
-#: ../src/disco.py:1715
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1780 ../src/gui_interface.py:3068
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Marcador"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Marcador ya definido"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3069
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, 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:1790 ../src/gui_interface.py:3082
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Marcador añadido con éxito"
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3083
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2000
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Añadido"
 
-#: ../src/disco.py:2008
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:2072
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Nuevo post"
 
-#: ../src/disco.py:2078
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/disco.py:2084
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
@@ -7559,7 +7469,7 @@ msgstr "Requiere python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Característica no disponible en Windows."
 
@@ -7725,98 +7635,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Requiere python-docutils"
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Banners y enlaces clickables"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr "Posibilidad de hacer URLs clickables en las ventanas de charla"
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Requiere python-sexy"
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Requiere python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Característica"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Archivo"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Nombre de archivo: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
 #: ../src/history_manager.py:522
 msgid "You"
 msgstr "Tú"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Recipiente: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado en: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Transferencia de archivo finalizada"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Abrir carpeta contenedora"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Transferencia de archivo cancelada"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipiente: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaje de error: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Transferencia del archivo detenida"
 
@@ -7824,7 +7726,7 @@ msgstr "Transferencia del archivo detenida"
 msgid "Choose File to Send..."
 msgstr "Elige archivo a enviar..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Descripción: "
 
@@ -7856,12 +7758,12 @@ msgstr "Descripción: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:888
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:890
+#: ../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."
@@ -7869,22 +7771,22 @@ msgstr ""
 "Un archivo con este nombre ya existe y no tienes permisos para "
 "sobreescribirlo"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:894
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Este archivo ya existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:894
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:901
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, 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:902
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "No tienes permisos para crear archivos en este directorio."
 
@@ -7920,76 +7822,56 @@ msgstr "Archivo: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim necesita el servidor X para para funcionar. Abortando..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "falló el importado de PyGTK: %s"
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim necesita PyGTK 2.12 o superior"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim necesita PyGTK 2.12 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
 msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim necesita GTK 2.12 o superior"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
 msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim necesita GTK 2.12 o superior para funcionar. Abortando..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "La biblioteca GTK+ necesita soporte de libglade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
-"estable desde %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Por favor, asegúrate de que GTK+ y PyGTK tienen soporte libglade en tu "
-"sistema."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim necesita PySQLite2 para funcionar"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necesita pywin32 para funcionar"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7999,11 +7881,11 @@ msgstr ""
 "obtenerlo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:327
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim ya se encuentra en ejecución"
 
-#: ../src/gajim.py:328
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8046,8 +7928,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "cuenta"
 
@@ -8069,14 +7951,17 @@ msgid "status"
 msgstr "estado"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "uno de: desconectado, en línea, libre para hablar, ausente, no disponible, "
 "ocupado, invisible"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "mensaje"
 
@@ -8316,70 +8201,89 @@ msgstr ""
 "enviado a todas las cuentas"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Manejar una uri xmpp:/"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI a manejar"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr "La cuenta que quieres manejar"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Contenido del mensaje"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Entrar en un salón MUC"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "salón"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID del salón"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "alias"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Alias a usar"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "contraseña"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Contraseña para entrar al salón"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Comprueba si Gajim se encuentra en ejecución"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Muestra u oculta la ventana ipython"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8388,15 +8292,15 @@ msgstr ""
 "'%s' no está en tu lista de contactos.\n"
 "Por favor, especifica una cuenta para enviar el mensaje."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "No tienes cuentas activas"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Parece que Gajim no está en ejecución. No puedes usar gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8405,16 +8309,16 @@ msgstr ""
 "Uso: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s no encontrado"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8423,7 +8327,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando es uno de:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8432,7 +8336,7 @@ msgstr ""
 "Demasiados argumentos. \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8441,7 +8345,11 @@ msgstr ""
 "No se especificó el argumento \"%(arg)s\". \n"
 "Escribe \"%(basename)s help %(command)s\" para más información"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Uri incorrecta"
 
@@ -8470,176 +8378,177 @@ msgstr "No puedes eliminar el tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#: ../src/groupchat_control.py:163
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Falló el envío del mensaje privado"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:165
+#: ../src/groupchat_control.py:166
 #, 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:435
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Insertar alias"
 
-#: ../src/groupchat_control.py:613
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Conversación con "
 
-#: ../src/groupchat_control.py:615
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Conversación continuada"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1224 ../src/gui_interface.py:1045
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Cualquier ocupante puede ver tu JID completo"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1227
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Registro del salón activado"
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Se ha creado un nuevo salón"
 
-#: ../src/groupchat_control.py:1232
+#: ../src/groupchat_control.py:1221
 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:1238
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1231
 #, 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:1252
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1245
 #, 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:1268 ../src/groupchat_control.py:1363
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_control.py:1284 ../src/gui_interface.py:889
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1322 ../src/groupchat_control.py:1326
-#: ../src/groupchat_control.py:1331
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1323
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "cambió la afiliación"
 
-#: ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "la configuración del salón cambió a sólo miembros"
 
-#: ../src/groupchat_control.py:1333
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "apagado del sistema"
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1401
 #, 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:1416
+#: ../src/groupchat_control.py:1405
 #, 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:1431
+#: ../src/groupchat_control.py:1420
 #, 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:1435
+#: ../src/groupchat_control.py:1424
 #, 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:1464
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_control.py:1469
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s ha entrado en el grupo de charla"
 
-#: ../src/groupchat_control.py:1471 ../src/gui_interface.py:914
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 está ahora %(status)s"
 
-#: ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1688
 #, 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:1706
+#: ../src/groupchat_control.py:1690
 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:1710 ../src/gui_interface.py:1165
-#: ../src/gui_interface.py:1924 ../src/gui_interface.py:1959
-#: ../src/message_window.py:227 ../src/roster_window.py:2659
-#: ../src/roster_window.py:3302 ../src/roster_window.py:3991
+#: ../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 "_No preguntarme otra vez"
 
-#: ../src/groupchat_control.py:1743
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Cambiando el tema"
 
-#: ../src/groupchat_control.py:1744
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Especifica el nuevo tema:"
 
-#: ../src/groupchat_control.py:1751
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Cambiando alias"
 
-#: ../src/groupchat_control.py:1752
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifica el nuevo alias que quieres usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1781
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruyendo %s"
 
-#: ../src/groupchat_control.py:1782
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8647,22 +8556,22 @@ msgstr ""
 "Vas a destruir definitivamente este salón.\n"
 "Puedes especificar una razón abajo:"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "También puedes introducir un lugar alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1965
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_control.py:1966 ../src/groupchat_control.py:2289
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2288
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -8683,62 +8592,62 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Informar de fallo"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detalles"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:202 ../src/gtkgui_helpers.py:217
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:393
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:396
+#: ../src/gtkgui_helpers.py:403
 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:437
+#: ../src/gtkgui_helpers.py:444
 #, 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:806
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim no es el cliente por defecto de Jabber"
 
-#: ../src/gtkgui_helpers.py:807
+#: ../src/gtkgui_helpers.py:819
 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:808
+#: ../src/gtkgui_helpers.py:820
 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:874
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Extensión no soportada"
 
-#: ../src/gtkgui_helpers.py:875
+#: ../src/gtkgui_helpers.py:888
 #, 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:911
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Guardar imagen como..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8749,58 +8658,58 @@ msgstr ""
 "ocupante.\n"
 "Especifica otro alias abajo:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Usar este alias siempre que exista un conflicto"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "¿Aceptas esta petición en la cuenta %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorización HTTP (%(method)s) para %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:203 ../src/notify.py:519
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Falló la conexión"
 
-#: ../src/gui_interface.py:542 ../src/gui_interface.py:546
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:556 ../src/gui_interface.py:570
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "error mientras se enviaba %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:595 ../src/notify.py:521
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Petición de adición"
 
-#: ../src/gui_interface.py:620
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gui_interface.py:621
+#: ../src/gui_interface.py:688
 #, 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:633
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gui_interface.py:634
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8808,59 +8717,59 @@ msgstr ""
 "Siempre le verás desconectado.\n"
 "¿Le quieres eliminar de tu lista de contactos?"
 
-#: ../src/gui_interface.py:658 ../src/notify.py:523
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Eliminado"
 
-#: ../src/gui_interface.py:699
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gui_interface.py:981
+#: ../src/gui_interface.py:1013
 #, 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:1048
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "El salón ahora muestra miembros no disponibles"
 
-#: ../src/gui_interface.py:1050
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "el salón ahora no muestra miembros no disponibles"
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1085
 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:1056
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Ha sido activado el registro del salón"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "El salón está ahora deshabilitado"
 
-#: ../src/gui_interface.py:1060
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "El salón es ahora no-anónimo"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "El salón es ahora semi-anónimo"
 
-#: ../src/gui_interface.py:1066
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "El salón es ahora completamente anónimo"
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:1131
 #, 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:1130
+#: ../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"
@@ -8868,24 +8777,24 @@ msgstr ""
 "Configuraste Gajim para usar un agente GPG, pero no hay ningún agente en "
 "ejecución o el mismo devolvió una contraseña errónea.\n"
 
-#: ../src/gui_interface.py:1132 ../src/gui_interface.py:1138
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gui_interface.py:1137
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gui_interface.py:1163
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG no confiable"
 
-#: ../src/gui_interface.py:1163
+#: ../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?"
@@ -8893,28 +8802,29 @@ msgstr ""
 "No se confía en la clave GPG usada para cifrar esta conversación. ¿Realmente "
 "quieres cifrar este mensaje?"
 
-#: ../src/gui_interface.py:1175
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1283
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Correo nuevo en %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1285
+#: ../src/gui_interface.py:1321
 #, 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:1298
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8929,42 +8839,42 @@ msgstr ""
 "Asunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1366
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gui_interface.py:1403 ../src/roster_window.py:1813
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "El contacto remoto detuvo la transferencia"
 
-#: ../src/gui_interface.py:1405 ../src/roster_window.py:1815
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Error abriendo el archivo:"
 
-#: ../src/gui_interface.py:1436
+#: ../src/gui_interface.py:1475
 #, 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:1440
+#: ../src/gui_interface.py:1479
 #, 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:1453
+#: ../src/gui_interface.py:1492
 #, 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:1457
+#: ../src/gui_interface.py:1496
 #, 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:1562
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8973,36 +8883,36 @@ msgstr ""
 "No se puede descifrar el mensaje de %s\n"
 "Es posible que haya sido manipulado."
 
-#: ../src/gui_interface.py:1569
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "No se puede descifrar el mensaje"
 
-#: ../src/gui_interface.py:1643
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Conflicto con nombre de usuario"
 
-#: ../src/gui_interface.py:1644
+#: ../src/gui_interface.py:1687
 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:1656
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1669
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1680
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Error."
 
-#: ../src/gui_interface.py:1707
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Conflicto en el recurso"
 
-#: ../src/gui_interface.py:1708
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9011,21 +8921,21 @@ msgstr ""
 "nuevo"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1755
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/gui_interface.py:1758
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/gui_interface.py:1863
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Error verificando el certificado SSL"
 
-#: ../src/gui_interface.py:1864
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9036,15 +8946,15 @@ msgstr ""
 "(error)s\n"
 "¿Aún quieres conectarte a este servidor?"
 
-#: ../src/gui_interface.py:1869
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este error para este certificado"
 
-#: ../src/gui_interface.py:1889
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Error del certificado SSL"
 
-#: ../src/gui_interface.py:1890
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9061,23 +8971,27 @@ msgstr ""
 "\n"
 "¿Aún quieres conectar y actualizar la huella del certificado?"
 
-#: ../src/gui_interface.py:1920 ../src/gui_interface.py:1955
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Conexión no segura"
 
-#: ../src/gui_interface.py:1921
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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 en una conexión no cifrada- ¿Estás seguro de "
-"querer hacer esto?"
+"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:1923 ../src/gui_interface.py:1958
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sí, quiero conectarme de forma no segura"
 
-#: ../src/gui_interface.py:1956
+#: ../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?"
@@ -9085,21 +8999,30 @@ 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:1976
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Vas a enviar tu contraseña en una conexión no cifrada- ¿Estás seguro de "
+"querer hacer esto?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "El nodo PEP no fue eliminado"
 
-#: ../src/gui_interface.py:1977
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "El nodo PEP %(node)s no se pudo eliminar: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2531 ../src/gui_interface.py:2553
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Emoticonos desactivados"
 
-#: ../src/gui_interface.py:2532
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9107,7 +9030,7 @@ msgstr ""
 "No se pudo encontrar tu tema de emoticonos configurado, los emoticonos han "
 "sido desactivados."
 
-#: ../src/gui_interface.py:2554
+#: ../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 "
@@ -9117,41 +9040,41 @@ msgstr ""
 "actualizar el formato del archivo emoticons.py. Mira http://trac.gajim.org/"
 "wiki/Emoticons para más detalles."
 
-#: ../src/gui_interface.py:2582 ../src/roster_window.py:3442
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2949
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gui_interface.py:3441
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/gui_interface.py:3442
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Introduce la contraseña GPG para la clave %(keyid)s (cuenta %(account)s)."
 
-#: ../src/gui_interface.py:3456
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "La clave GPG expiró"
 
-#: ../src/gui_interface.py:3457
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Tu clave GPG ha expirado, te conectarás a %s sin OpenPGP"
 
 #. ask again
-#: ../src/gui_interface.py:3466
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Contraseña equivocada"
 
-#: ../src/gui_interface.py:3467
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, vuelve a escribir tu contraseña GPG o presiona Cancelar."
 
@@ -9174,7 +9097,7 @@ msgstr "Contactos"
 
 #. holds time
 #: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:97
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Fecha"
 
@@ -9185,7 +9108,7 @@ msgstr "Alias"
 
 #. holds message
 #: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:105
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Mensaje"
 
@@ -9271,35 +9194,35 @@ msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Expiró el tiempo para cargar la imagen"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "La imagen es demasiado grande"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "¿Realmente quieres cerrarlas todas?"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Conversaciones privadas"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Mensajes"
 
@@ -9311,47 +9234,47 @@ msgstr "- los mensajes serán registrados"
 msgid "- messages will not be logged"
 msgstr "- los mensajes no serán registrados"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambió su estado"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s se ha conectado"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s se ha desconectado"
 
-#: ../src/notify.py:277
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: ../src/notify.py:284
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nuevo mensaje privado desde el grupo de charla %s"
 
-#: ../src/notify.py:286
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:289
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Enviado por %(nickname)s"
 
-#: ../src/notify.py:294
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nuevo mensaje de %(nickname)s"
 
-#: ../src/notify.py:561
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -9359,18 +9282,18 @@ msgstr "Ignorar"
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2846
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "El archivo está vacío"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2849
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2851 ../src/roster_window.py:2862
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "No se pudo cargar la imagen"
 
@@ -9402,51 +9325,51 @@ msgstr ""
 "Ocurrió un error mientras se publicaba tu información personal, inténtalo de "
 "nuevo más tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1893
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1941
 #, 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:1908
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:1937
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG no es usable"
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Te conectarás a %s sin OpenPGP"
 
-#: ../src/roster_window.py:2147 ../src/roster_window.py:3395
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 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:2148 ../src/roster_window.py:3396
+#: ../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?"
@@ -9454,27 +9377,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:2174
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "desincronizado"
 
-#: ../src/roster_window.py:2235
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "¿Cerrar realmente Gajim?"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "¿Estás seguro de que quieres cerrar Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Siempre cerrar Gajim"
 
-#: ../src/roster_window.py:2332 ../src/roster_window.py:2577
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Cancela la transferencia"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:2333
+#: ../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."
@@ -9482,27 +9416,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:2578
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Debes leerlos antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:2582
+#: ../src/roster_window.py:2655
 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:2585
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Los transportes serán eliminados"
 
-#: ../src/roster_window.py:2590
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9510,68 +9444,68 @@ msgid ""
 msgstr ""
 "Ya no podrás enviar y recibir mensajes a contactos de estos transportes: %s"
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2731
 #, 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:2656
+#: ../src/roster_window.py:2733
 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:2742
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Renombrar contacto"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduce un nuevo alias para el contacto %s"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Renombrar grupo"
 
-#: ../src/roster_window.py:2751
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduce un nuevo nombre para el grupo %s"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Eliminar grupo"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2879
 #, 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:2794
+#: ../src/roster_window.py:2880
 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:2833
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:2834
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:3211
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:3213
+#: ../src/roster_window.py:3305
 #, 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:3218
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9580,11 +9514,11 @@ msgstr ""
 "resultante y el/ella siempre te verán desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3224
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "¿Quieres continuar?"
 
-#: ../src/roster_window.py:3227
+#: ../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."
@@ -9592,16 +9526,16 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:3230
+#: ../src/roster_window.py:3323
 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:3234
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Los contactos serán eliminados de tu roster"
 
-#: ../src/roster_window.py:3239
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9611,32 +9545,32 @@ msgstr ""
 "también estás eliminando las autorizaciones resultantes y ellos siempre te "
 "verán desconectado."
 
-#: ../src/roster_window.py:3296
+#: ../src/roster_window.py:3390
 #, 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:3298
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:3318
+#: ../src/roster_window.py:3412
 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:3898
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Tu servidor no soporta almacenamiento de metacontactos"
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9644,12 +9578,12 @@ msgstr ""
 "Tu servidor no soporta almacenar información de metacontactos. Luego toda la "
 "información referente no se guardará en la próxima reconexión."
 
-#: ../src/roster_window.py:3985
+#: ../src/roster_window.py:4114
 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:3987
+#: ../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 "
@@ -9659,23 +9593,23 @@ msgstr ""
 "Generalmente se usan cuando la misma persona tiene varias cuentas de Jabber "
 "o cuentas de transportes."
 
-#: ../src/roster_window.py:4102
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "URI de archivo no válido:"
 
-#: ../src/roster_window.py:4113
+#: ../src/roster_window.py:4243
 #, 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:4228
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s a %s"
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Hacer %s y %s metacontactos"
@@ -9685,127 +9619,131 @@ msgstr "Hacer %s y %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4719 ../src/roster_window.py:4790
-#: ../src/roster_window.py:4799 ../src/statusicon.py:245
-#: ../src/statusicon.py:292 ../src/statusicon.py:298
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
 #. add
-#: ../src/roster_window.py:4806
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
 #. disco
-#: ../src/roster_window.py:4811
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:4848 ../src/statusicon.py:308
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Gestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4868
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "de la cuenta %s"
 
-#: ../src/roster_window.py:4908
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:4964 ../src/roster_window.py:5062
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:4988
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Hora de publicación"
 
-#: ../src/roster_window.py:4996
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Hora de publicación"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Configurar servicios..."
 
-#: ../src/roster_window.py:5140
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maximizar todo"
 
-#. Send Group Message
-#: ../src/roster_window.py:5148 ../src/roster_window.py:5316
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Enviar mensaje a grupo"
 
-#: ../src/roster_window.py:5156
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "A todos los usuarios"
 
-#: ../src/roster_window.py:5160
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "A todos los usuarios en línea"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5336
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Gestionar contactos"
 
 #. Edit Groups
-#: ../src/roster_window.py:5344
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5399
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Enviar mensaje"
 
 #. Execute Command
-#: ../src/roster_window.py:5445
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Ejecutar comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5455
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Gestionar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5463
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
 #. Rename
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "Renombrar"
 
-#: ../src/roster_window.py:5533
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:5547
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
 #. History manager
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Histórico"
 
-#: ../src/roster_window.py:5640
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Entrar en nuevo grupo de charla"
 
-#: ../src/roster_window.py:5807
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
@@ -9836,13 +9774,13 @@ msgid "Confirm these session options"
 msgstr "Confirma estas opciones de la sesión"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "El cliente remoto quiere negociar una sesión con estas características:\n"
 "\n"
@@ -9865,116 +9803,126 @@ msgstr ""
 "\n"
 "¿Continuar con la sesión?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
 #: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "en _roster"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [bloqueado]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimizado]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Subscripción: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Música:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Notificaciones"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 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:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10047,6 +9995,345 @@ msgstr "No hay ninguna suscripción pendiente."
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Entrar a un grupo de charla"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Añadir contacto..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Descubrir servicios"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Ejecutar comando..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Modificar cuenta"
+
+#~ msgid "_Personal Events"
+#~ msgstr "Eventos _personales"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "Iniciar conver_sación"
+
+#~ msgid "_Status"
+#~ msgstr "_Estado"
+
+#~ msgid "Account Modification"
+#~ msgstr "Modificar cuenta"
+
+#~ 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 ""
+#~ "Marcando esta opcón, Gajim conectará al puerto 5223 cuando un servidor "
+#~ "viejo use SSL. Observa que Gajim usa encripatdo TLS por defecto si "
+#~ "estádisponible en el servidor, y que con esta opción se desactiva el TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "_Editar información personal personales..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Nombre del host:"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Si está marcado, Gajim guardará la contraseña en ~/.gajim/config con "
+#~ "acceso de lectura sólamente para tí"
+
+#~ msgid "Port: "
+#~ msgstr "Puerto: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Guardar contraseña (inseguro)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Enviar paquetes de mantenimiento de actividad"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Usar _SSL (el viejo)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Ajustar al estado"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Eliminar MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Enviar mensaje de servidor"
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Recibir un mensaje\n"
+#~ "Contacto conectado \n"
+#~ "Contacto desconectado \n"
+#~ "Contacto cambia de estado \n"
+#~ "Mensaje de grupo de charla resaltado \n"
+#~ "Mensaje de grupo de charla recibido \n"
+#~ "Petición de transferencia \n"
+#~ "Transferencia iniciada \n"
+#~ "Transferencia finalizada"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "contacto(s)\n"
+#~ "grupo(s)\n"
+#~ "todo el mundo"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Entrar a un grupo de charla"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Copiar la dirección de correo/ID de Jabber"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Copiar la dirección del enlace"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Abrir el compositor de correo"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Abrir enlace en navegador"
+
+#~ msgid "_Start Chat"
+#~ msgstr "Iniciar conversación"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Cuenta\n"
+#~ "Grupo\n"
+#~ "Contacto\n"
+#~ "Banner"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Cambiar _Alias"
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Cambiar el _tema"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Configurar el salón"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Desmantelar salón"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Gestionar salón"
+
+#~ msgid "Send _File"
+#~ msgstr "Enviar archivo"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Añadir a la lista de contactos"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Enviar mensaje privado"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Introduce JID o nombre de contacto\n"
+#~ "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"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Añade éste contacto al roster (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Añadir este salón a marcadores (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Navegar en el histórico de la conversación (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Cambiar el tema del salón (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Cambiar tu _alias (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Invitar contactos a esta conversación (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Enviar un archivo (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Mostrar una lista de emoticonos (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Mostrar una lista de formateos"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Muestra un menú de funciones avanzadas (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Muestra el perfil del contacto (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Todos los estados de chat\n"
+#~ "Sólo componiendo\n"
+#~ "Desactivado"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Autodetectar en cada inicio de Gajim\n"
+#~ "Siempre usar las aplicaciones por defecto de GNOME\n"
+#~ "Siempre usar las apliacciones por defecto de KDE\n"
+#~ "Siempre usar las aplicaciones por defecto de Xfce\n"
+#~ "Personalizado"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Roster desacoplado con conversaciones desacopladas\n"
+#~ "Roster desacoplado con conversaciones independientes\n"
+#~ "Ventana independiente para todo\n"
+#~ "Roster desacoplado con conversaciones agrupadas por cuenta\n"
+#~ "Roster desacoplado con conversaciones agrupadas por tipo"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Emerger aviso\n"
+#~ "Notificarmelo\n"
+#~ "Mostrar sólo en roster"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ninguno\n"
+#~ "ambos\n"
+#~ "de\n"
+#~ "a"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "_Añadir contacto..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Carac_terísticas"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Transferencias"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Perfil, A_vatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Cuentas"
+
+#~ msgid "_Contents"
+#~ msgstr "_Contenidos"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Preferencias"
+
+#~ msgid "_Quit"
+#~ msgstr "_Salir"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "E_nviar mensaje..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Enviar mensaje"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Es_tado"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Grupos de charla"
+
+#~ msgid "Enable"
+#~ msgstr "Activar"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modificar cuenta..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Host erróneo"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "¿Dirección local no válida? :-O"
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Banners y enlaces clickables"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr "Posibilidad de hacer URLs clickables en las ventanas de charla"
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Requiere python-sexy"
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "La biblioteca GTK+ necesita soporte de libglade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
+#~ "estable desde %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Por favor, asegúrate de que GTK+ y PyGTK tienen soporte libglade en tu "
+#~ "sistema."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim necesita PySQLite2 para funcionar"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "Mens_aje entrante:"
 
@@ -10266,12 +10553,6 @@ msgstr " recurso con prioridad "
 #~ msgid "Gajim account %s"
 #~ msgstr "Cuenta de Gajim %s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "¿Usar siempre las aplicaciones por defecto de OS/X?"
-
-#~ msgid "Custom"
-#~ msgstr "Personalizado"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "ID de Jabber duplicada"
 
@@ -10379,9 +10660,6 @@ msgstr " recurso con prioridad "
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo y Julieta</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Historias viejas"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquio"
 
@@ -10496,9 +10774,6 @@ msgstr " recurso con prioridad "
 #~ msgstr ""
 #~ "Cambiar el mensaje de estado para reflejar la pista_musical en curso"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Sólo mostrar en la _lista de contactos"
-
 #~ msgid "The auto away status message"
 #~ msgstr "El mensaje de estado de auto-ausencia"
 
@@ -10535,18 +10810,9 @@ msgstr " recurso con prioridad "
 #~ msgid "_Before time:"
 #~ msgstr "_Antes de la hora"
 
-#~ msgid "_Never"
-#~ msgstr "_Nunca"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Notificarme"
-
 #~ msgid "_Player:"
 #~ msgstr "_Reproductor:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Emerger"
-
 #~ msgid "Address"
 #~ msgstr "Dirección"
 
diff --git a/po/eu.po b/po/eu.po
index c1c9aabb1..3db5e99d0 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-08-19 23:50+0200\n"
 "Last-Translator: Urtzi  <>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -18,63 +18,11 @@ msgstr ""
 "X-Rosetta-Version: 0.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber bezeroa"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
-msgid "Join _Group Chat..."
-msgstr "Txat Taldean _Sartu"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Kontaktua Gehitu..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Zerbitzuak Aurkitu"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Komandoa Exekutatu..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Kontua E_raldatu"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Ireki Gmail posta"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Informazio Pertsonala "
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "Elkarrizketa  _Hasi"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Egoera"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -85,83 +33,90 @@ msgstr ""
 "\n"
 "Mesedez itxoin..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Mesedez aukeratu hemen beheko aukeretako bat:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Mesedez bete zure kontu berrirako informazioa</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Erabili autentifikazioa"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Konektatu bukatu sakatzen dudanean."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontu Sortzailearen Wizard-a"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Dagoeneko badut kontu bat erabiltzeko"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Moldatu..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ezer ez"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Gorde pasa_hitza"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Ezarri nire profila konektatzen naizenean"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Erabili bezeroaren hostname/portua"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -169,150 +124,146 @@ msgstr ""
 "Kontu bat behar duzu\n"
 "Jabber sarera konektatzeko"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "A_urreratua"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Bukatu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Hostname: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Portua:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Zerbitzaria"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Denetatik</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazio Pertsonala</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Ezaugarriak</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "Egoerarekin b_at egin"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Kontua"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Kontu Eraldaketa"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Kontuak"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Administratzaile Zerrenda"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Erabili autentifikazioa"
+
+#: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Konektatu berriro konexioa galtzean"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_onektatu Gajim irikitzean"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Al_datu Pasahitza"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"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"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Aukeratu _Kodea...."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Sakatu kontuaren pasahitza aldatzeko"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "K_onektatu Gajim irikitzean"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Konektatu"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Informazio Pertsonala Editatu..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "E-Posta:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Lehen Izena:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Orokorra"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Hostname: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -320,8 +271,12 @@ msgstr ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, 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:26
 #, fuzzy
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
@@ -330,16 +285,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek keep-alive paketeak bidaliko ditu deskonexioa "
 "gerta ez dadin"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Hautatua badago, Gajim-ek pasahitzak  ~/.gajim/config gordeko ditu "
-"irakurtzeko baimena zuk bakarrik izanik"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -347,8 +293,7 @@ msgstr ""
 "Hautatua badago, abiaraztean, automatikoki jabber-era konektatuko da kontu "
 "hau erabiliz"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -358,47 +303,49 @@ msgstr ""
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Zuri buzuzko informazioa zerbitzarian gordea izango da"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Azken Izena:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Batu kontuak"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Ezer ez"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Informazio Pertsonala "
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Portua: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Lehentas_una:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -408,23 +355,21 @@ msgstr ""
 "berdinarekin, zeinek jaso behar duen informazioa determinatzen du; "
 "Lehentasun handiena duen bezeroak jasotzen ditu mezuak"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Lehentasuna automatikoki ezarriko da zure egoeraren arabera."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "_Berrizenpetu"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "Baliabid_ea: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -438,213 +383,99 @@ msgstr ""
 "jarrita eta kontu berdera `etxea` baliabidearekin jarria baduzu, mezua "
 "lehentasun handiena duenera bidaliko da. (Behean ikusi) "
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Gorde _pasa-esaldia(ez trinkoa)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "_Gorde kontu guztien elkarrizketak"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Bidali keep-alive paketeak"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Ikusi _Deskonektatutako Kontaktuak"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Erabili _SSL(Legacy)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Erabili proxy fitxero transferentzia"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "Egoerarekin b_at egin"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-#, fuzzy
-msgid "_Name:"
-msgstr "_Izena "
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Ezaugarriak</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "Egoerarekin b_at egin"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Kontuak"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Erabili autentifikazioa"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "K_onektatu Gajim irikitzean"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Posta:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Lehen Izena:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, 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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Azken Izena:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Batu kontuak"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "_Berrizenpetu"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Bidali keep-alive paketeak"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Egoera globalarekin kontaktuen egoera sinkro_nizatu "
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Ikusi _Deskonektatutako Kontaktuak"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Erabili bezeroaren hostname/portua"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Erabili ezarritako portua:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Erabili proxy fitxero transferentzia"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Informazio Pertsonala Editatu..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Aktibatu"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Hostname: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Moldatu..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Portua:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "Kontu_a:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Kontaktu Berri bat Sartu"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../data/gui/add_new_contact_window.ui.h:5
 #, fuzzy
 msgid ""
 "You have to register with this transport\n"
@@ -656,7 +487,7 @@ msgstr ""
 "protokolo honetako kontaktu bat ezartzeko.\n"
 "Sakatu erregistratu botoian jarraitzeko."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -664,634 +495,686 @@ msgstr ""
 "Transporte batera konektatuta egon behar zara\n"
 "protokolo honetako kontaktu bat sartzeko."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "Ta_ldea:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Izengoitia:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokoloa:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "Erre_gistratu"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 #, fuzzy
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Akats bat gertatu da:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Aukeratu betebeharreko komandoa:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc Commands - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Berriro saiatu"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Deskripzio errorea...."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Mesedez itxoin komandoak jasotzen diren bitartean..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Mesedez itxoin komandua bidaltzen den bitartean..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Mesedez itxoin..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "E  Ez da komandurik aurkitu"
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Deskribapena</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 #, 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Konfigurazio Aurreratuaren Editorea"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtroa:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Ezabatu MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Eguneko Mezuak Ezabatu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "_Debekatze Zerrenda"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Bidali mezu bat zerbitzari honetara orain konektatuta dauden kontaktuei"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Ezarri MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Ezarri Eguneko Mezua"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "_XML Konsola Ikusarazi"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "MOTD Gaurkotu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Eguneko Mezua Gaurkotu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administratzailea"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Bidali Zerbitzarira Mezua"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr "leiho/tab bat kontaktu batekin irekia"
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Ekintzak</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Baldintzak</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Soinuak</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Ekintza Aurreratuak"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Notifikazio Aurreratuaren Kontrola"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Egoera Guztiak"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Kanpoan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Lanpetuta"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Ikusezin"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Abiarazi agindua"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Ez Erabilgarri"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Egorera berezi bat edo gehiago..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Libre / Libre Hitz Egiteko"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Soinua ezarri"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Mezu bat Jasoa\n"
-"Kontaktua Konektatua\n"
-"Kontaktua Deskonektatua\n"
-"Kontaktuak Egoeraz Aldatua\n"
-"Txat Taldeko Mezu bat Bistaratua\n"
-"Txat Taldeko Mezu bat Jasoa\n"
-"Fitxero Transferentzia Eskatua\n"
-"Fitxero Transferentzia Hasia\n"
-"Fitxero Transferentzia Bukatua"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Ezindu automatikoki elkarrizketa leihoa irikitzea"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Kendu esistitzen den popup leihoa "
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Ezindu esistitzen den soinua gertaera hontarako "
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Ezindu gertaeran zerrendan ikustea"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Ezindu gertaerak systray-en ikustea"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Jakinarazi popup leiho batekin"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Ireki elkarrizketa leihoa erabiltzailearekin"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Ikusarazi gertaera zerrendan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "Iku_si gertaerak systray-ean"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "eta nik"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kontaktua(k)\n"
-"taldea(k)\n"
-"denak"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "norentzat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Sarrera:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Emandako izena:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Azken Eraldaketa:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Ekintza berri bat jasoa"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Sarrera berri bat jaso duzu:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "Kontaktua"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Soinuak</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Aldatu Pasahitza"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Sartu berriro baieztatzeko:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Sartu pasahitz berria:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Egoera mezu berria ezarri</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Aktibatuta"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Gela:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Ezarritako egoerak:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Gorde Ezarritako Bezala...."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Txat Taldean _Sartu"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Zerrendara Sartu"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopiatu JID/Email-a"
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Lotura kokapena kopiatu"
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Ireki E-posta Konposatzailea"
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "Web-ean _Ireki Lotura"
+#. 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 "_Bidali"
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "Elkarrizketa  _Hasi"
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "Honera gonbidatu"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "Begiratzaileak"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "Bere egoera ikusteko esan"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "Gehitu _Noifikazio Berezia"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "Open_PGP kodea zehaztu"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Komandoa Exekutatu..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Editatu _Taldeak"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "Honera gonbidatu"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Kontaktua"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Ezabatu"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Sends custom XML"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Bidali _Mezu Bakarra..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "Bidali _Fitxeroa"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Elkarrizketa _Hasi"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Toggle Open_PGP Encryption"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Toggle Open_PGP Encryption"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Zerrendara Sartu"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "Baimendu nire egoera ikustea"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "Debekatu nire egoera ikustea"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historiala"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Berrrizenpetu"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "Har_pidetza"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "bederatzi"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Formularioan bete"
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Gelaren Konfigurazioa"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Taldeak Editatu"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Deskribapena</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Fitxategi transferentzia kantzelatu"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Kantzelatu aukeratutako fitxategi transferentzia"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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 "
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Garbitu"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Fitxero Transferentzia"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Leihoa ezkutatu"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Listatik fitxero tranferentzia ezabatu."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1299,75 +1182,74 @@ msgstr ""
 "Aukera honek fitxero transferentzia bakar bat kantzelatzen du. "
 "Transferentzia martxan badago, lehenik gelditu egingo da eta ondoren ezabatu."
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Jarraitu"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Jakinarazi  fitxeroa transferitu denean"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Ireki Fitxeroaren Edukia"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Eten"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "fitxeroen transferentziaren lista"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Elkarrizketako Egoeren Koloreak</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Kontu zerrenda\n"
-"Talde zerrenda\n"
-"Kontaktu zerrenda\n"
-"Banner Elkarrizketa "
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Kontua"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Sortzen"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontaktua"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Iturburuaren estiloa:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajim-en Gaien Kustomizatazailea"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Joanda"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Taldea"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiboa"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Etzana"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1375,7 +1257,7 @@ msgstr ""
 "MUC\n"
 "Mezuak"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1383,115 +1265,74 @@ msgstr ""
 "MUC Zuzendua\n"
 "Mezuak"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Etena"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Testuaren _kolorea:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Testu _mota:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "A_tzealdeko kolorea:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "Aldatu _Izengoitia"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "Aldatu _Gaia"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "Gela Konfigu_ratu"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-#, fuzzy
-msgid "_Bookmark"
-msgstr "_Talde Agendan Sartu Gela hau"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Talde Agenda Moldatu"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_deratzailea"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Bete Beharreko Aukerak"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Bidali _Fitxeroa"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Zerrendara Sartu"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Debekatu"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Bota"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Partaidea"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Jabea"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Bidali Mezu Pribatu bat"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Ahotsa"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Mezu berria sortu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "-etik"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Gaia"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1506,26 +1347,20 @@ msgstr ""
 "Ezabatze handia egin behar baduzu, Gajim abiarazita ez dagoela begira ezazu. "
 "Normalean hitz egiten ari zaren kontaktuaen ezabaketak arbuilatzen ditu."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Ezabatu"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Esportatu"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Historialeko Log Administratzailea"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1534,425 +1369,439 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Bilatu Datu Basean"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Kontaturen izena"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Txat Taldeak"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Bilatu"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "_Talde Agendan Sartu Gela hau"
+msgid "Bro_wse Rooms"
+msgstr "_Bilatu"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Txat Taldean Sartu"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/gui/join_groupchat_window.ui.h:4
 #, fuzzy
-msgid "Join this room automatically when I connect"
+msgid "Join this room _automatically when I connect"
 msgstr "Ezarri nire profila konektatzen naizenean"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Izengoitia:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Berriki:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Zerbitzaria:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "_Talde Agendan Sartu Gela hau"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Sartu"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Kontuak moldatu"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Automatikoki sartu"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Talde Agenda Moldatu"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Inprimatu egoera:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Zerbitzaria:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Izenburua:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Gelaren Konfigurazioa"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Jarraitu"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "Ezabatu"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Ezaugarriak</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Aldaketak</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr "HTTP konektatuta"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Proxy Profila Moldatu"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Pasa_hitza:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Portua:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Erabili autentifikazioa"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "_URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+#, fuzzy
+msgid "_Name:"
+msgstr "_Izena "
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Mota:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Izena"
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Zerrendara kontaktua sartu"
-
-#: ../data/glade/message_window.glade.h:2
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Talde Agendan Sartu Gela hau"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Aldatu _Izengoitia"
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "arreta jartzen ari da elkarrizketara"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Bidali"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Pasa-esaldia"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Konfigurazio Aurreratuaren Editorea</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikazioak</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Ekintzak</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Ekintzak</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Elkarrizketako Egoeren Koloreak</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Ikusizko Jakinarazketa</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Baldintzak</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Bezeroak</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Soinuak</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail Aukerak</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<i>Debekatze Zerrenda</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Egoera Mezu Ezarriak</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Ezaugarriak</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Ezarri Araua</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Ikusizko Jakinarazketa</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Aurreratua"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Elkarrizketa guztien egoera\n"
-"Konposatzen bakarrik\n"
-"Desaktibatuta"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Egoera Guztiak"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Baimena _OS informazioa bidaltzeko"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Baimena _OS informazioa bidaltzeko"
+
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Baimendu Popup/Jakinarazteak nagoenean:  Kanpoan/Ez Erabilgarri/Lanpetuta/"
 "Ikusezin"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Kanpoan"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Eskatu egoera mezua, nagoenean:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"Autodetektatu Gajim abiarazten den bakoitzean\n"
-"Beti GNOME-ren berezko aplikazioak erabili\n"
-"Beti KDE-ren berezko aplikazioak erabili\n"
-"Beti Xfce-ren berezko aplikazioak erabili\n"
-"Bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "K_onektatu Gajim irikitzean"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Sortzen"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Interfazeko kolorea eta letra konfiguratu"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontaturen izena"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Bezeroak</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Ezindu"
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Erakutsarazi epostaren g_ehigarrizko xehetasunak"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Kontaktuen a_batereak erakutsi zerrendan"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Kontaktuen a_batereak erakutsi zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Erakuts arazi kontaktuen egoera _mezua zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1962,7 +1811,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "display in chat windows."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1972,7 +1821,7 @@ msgstr ""
 "may have with a contact. Here you can specify which chatstates you want to "
 "send to the other party."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1980,19 +1829,19 @@ msgstr ""
 "Deskonektatu diren kontaktuez Gajim-ek jakinaraziko dizu popup bidez "
 "pantailako beheko eskubiko aldean"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Ezkutatu botoiak txat taldeko leihoan."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -2000,18 +1849,18 @@ msgstr ""
 "Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
 "ere jarriko du."
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2019,7 +1868,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -2027,7 +1876,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
 "azpian eta txat taldeetan"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2035,7 +1884,15 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2043,7 +1900,7 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2051,14 +1908,14 @@ msgstr ""
 "Hautatua badago, Gajim-ek zerrendan eta txat taldeetan kontaktuen abatereak "
 "azalaraziko ditu"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2068,14 +1925,14 @@ msgstr ""
 "Bakarrik hautatu aukera hau zerrendan ez duzun norbaitek zirikatzen bazaitu. "
 "Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak blokeatzen ditu"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2084,7 +1941,7 @@ msgstr ""
 "Aukeratu baduzu, Gajim-ek e-postako mezu berrien bidaltzailearen informazioa "
 "ere jarriko du."
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2094,13 +1951,13 @@ msgstr ""
 "ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
 "jarriko dira)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2108,79 +1965,104 @@ msgstr ""
 "Ez badago ezeztatuta, Gajim-ek  ´:)´ ascii hauek bere irudi grafiko estatiko "
 "edo animatura eraldatuko ditu"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "M_ezu leiho bat"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Mo_ldatu..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Inoiz"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Kontu Eraldaketa"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Jakinarazi kontaktuek hau egitean: "
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Jakinarazi horri buruz"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "_Gmail-eko E-posta berri batez jakinarazi"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Informazio Pertsonala "
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Agertarazi"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Hobespenak"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Zerbitzaria:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Ikusi _zerrendan bakarrik"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "Iku_si gertaerak systray-ean"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Konektatuta"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Deskonektatuta"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2188,30 +2070,30 @@ msgstr ""
 "Mezu batzuk gehiegizko edukia izan dezakete(koloreak, tamaina...). Hautatua "
 "badago, Gajim-ek testua modu sinple batean erakutsiko du. "
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Sailkatu kontaktuak egoeraren bidez"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Egoera"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Berezko egoera _ikurra:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "Stalled"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "G_aia:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2219,7 +2101,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2227,789 +2109,765 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Erabili _transporteen ikurrak"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "_Sistemaren berezkoa erabili"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Ekintza berri bat jasotzean."
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Errore mezua: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Izengoitia baino l_ehen:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "Automatikoki _Kanpoan ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticonoak:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Fitxero administratzaile:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ez kasu egin gehiegizko edukiari sarrera mezuetan"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "Kontaktuen egoera aldaketak gorde"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Automatikoki _Ez Erabilgarri ondoren:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Ireki..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "Be_rezko Koloreak Ezarri"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Txat-eko egoeren jakinarazteak aza_l arazi:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "Egoera mezua:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "Txat Taldean _Sartu"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "Ez dago zerrendan"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutu"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Debekatze Zerrendak:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Ezarri / Editatu arau bat</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Arauen zerrenda</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Debekatze Zerrenda</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktibatu saio honetarako"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktibatu hastean"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Dena"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "harpidetza honekin"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Baimendu"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Ukatu"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Ordena:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Debekatze Zerrenda"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "harpidetza honekin"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "talde hontakoak"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ezer\n"
-"biak\n"
-"nondik\n"
-"norentzat"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Biak"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "-etik"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "bat"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "bi"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "niri mezuak bidaltzea"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "niri galderak bidaltzeko"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "niri egoera bidaltzeko"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "nire egoera ikustea"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "Abatarea:"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Birthday:</b>"
 msgstr "Urtebetetzea:"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Bezeroak</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../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/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Soinuak</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Departamentua:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Posta:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Helbide Gehigarria:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familia:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Bezeroak</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Web Pertsonala:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Bezeroak</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Izengoitia:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefono Zenbakia:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Baldintzak</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Posta Kodea:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Ezaugarriak</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Soinuak</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Aldaketak</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Aldaketak</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Soinuak</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "About"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Sakatu abatarea ezartzeko"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Informazio Pertsonala "
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Lana"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Zer nahi duzu egin?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Ezabatu kontua Gajim-etik eta baita _zerbitzaritik"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Ezabatu"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Ezabatu"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Kontaktua Gehitu..."
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Zerbitzariaren Ezaugarriak:"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Fitxero _Transferentzia"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Frequently Asked Questions (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Online laguntza"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profila, A_batarea"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Trans_porteak Erakutsi"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Ikusi _Deskonektatutako Kontaktuak"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Ikusi _Zerrenda"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Kontuak"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Aukerak"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Edukiak"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Hobespenak"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "At_era"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Bidali _Mezu Bakarra..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "Mesedez itxoin komandoak jasotzen diren bitartean..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Kontaktua _Sartu"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Bilatu"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "J_oan"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Helbidea:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Erregistratu honetara"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_kantzelatu"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Norena:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Erantzun mezu honi"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Bidali"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Bidali mezua"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Bidali mezua eta itxi leihoa"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Norentzat:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Bidali eta Itxi"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Autorizatu"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Autorizazioa ezeztatu, honela kontaktuak ezin du zure egoera ikusi"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Harpidetza Eskaria"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Ukatu"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Soinua Kendu"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Bidali _Mezu Bakarra"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Ikusi Gabeko _Gertaerak"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "E_goera"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "Txat _Taldea"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Ekintzak</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Bezeroak</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Aldaketak</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Baliabidea:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Aldaketak</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Deskribapena</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Bezeroak</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Azalpenak"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Gela Konfigu_ratu"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Gehiago"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "Abatarea:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Soinuak</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikoa</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Sarrera</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktibatu"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Informatu/Galdetu"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IG"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mezua"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Egoera"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "Kontua E_ditatu"
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Tokiko jid-a:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Pertsonala"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Baliabidea:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Egoera:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber bezeroa"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3037,7 +2895,7 @@ msgstr "Taldean"
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr ""
 
@@ -3181,134 +3039,134 @@ msgstr "Swedish"
 msgid "Chinese (Ch)"
 msgstr "Txinera (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Ortografia hizkuntza"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Konexioa ez dago erabilgarri"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr "Zure mezua ezin da bidali konektatu harte"
 
-#: ../src/chat_control.py:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "bederatzi"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Izengoitia"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "_Mota:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Enkriptazioa aktibatuta"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Fitxategi tranferentzia aktiboen, bukatutakoen eta gelditutakoen lista"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Erabili autentifikazioa"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Erabili autentifikazioa"
@@ -3316,58 +3174,58 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3375,136 +3233,146 @@ msgstr ""
 "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
 "duzu."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s orain dago %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "logs-en datu basea sortzen"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "logs-en datu basea sortzen"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "%s direktorioa sortzen"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 #, fuzzy
 msgid "Change status information"
 msgstr "Kontaktuaren Informazioa"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 #, fuzzy
 msgid "Change status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 #, fuzzy
 msgid "Free for chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 #, fuzzy
 msgid "Online"
 msgstr "bederatzi"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Do not disturb"
 msgstr "Ez nahasi."
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 #, fuzzy
 msgid "Presence description:"
 msgstr "Deskripzio errorea...."
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Txat Taldea Berria"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s  %(room_name)s gelatik"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s gelan sartu da"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Txat Taldeak"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "%d mezu irakurri gabe"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3602,9 +3470,9 @@ msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Berezkoa"
@@ -3878,11 +3746,11 @@ msgstr ""
 "Egia bada, Gajim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
 "kontaktuaren izenaren azpian azalduko dira."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3890,7 +3758,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:230
+#: ../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."
@@ -3898,7 +3766,7 @@ msgstr ""
 "Gezurra bada, ez da egoera lerroa inprimatuko kontaktu batek bere egoera "
 "aldaketa egiten duenean edo/eta bere egoera mezua."
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:232
 #, fuzzy
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
@@ -3913,30 +3781,30 @@ msgstr ""
 "inprimatuko ditu. \"in_and_out\" bada, Gajim-ek sarrera/irteerak inprimatuko "
 "ditu bakarrik."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Kontaktuen atzealdeko kolorea momentuan konektatzen direnean."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Kontaktuen atzealdeko kolorea momentuan deskonektatzen direnean."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Ez erakutsarazi transporteen ikurrak."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "ez erakutsi zerrenda sistemako zeregin barran."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3946,7 +3814,7 @@ msgstr ""
 "badira, make the window flash (the default behaviour in most Window "
 "Managers) when holding pending events."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3957,7 +3825,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3977,32 +3845,32 @@ msgstr ""
 "konkretu batera bidaliko dira. Kontuz, funtziona dezan Gajim berriarazi "
 "behar da."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Ezkutatu botoiak txat taldeko leihoan."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Ezkutatu banner-a txat talde leihoan"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Ezkutatu banner-a bi pertsonen txat leihoan "
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Ezkutatu gelako jendearen zerrenda txat taldeko leihoan."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -4010,28 +3878,28 @@ msgstr ""
 "Elkarrizketa batean, bakarrik lerroaren hasieran izengoitia erakutsi  ez "
 "denean lehengo mezuan hitz egiten ari zinen pertsona bera. "
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickame."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Bidali mezua eta itxi leihoa"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, 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:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4039,7 +3907,7 @@ msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4048,7 +3916,7 @@ msgstr ""
 "Ikusi beharko da metakontaktuen baieztatze leihoa?  Empty string means we "
 "never show the dialog."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4057,7 +3925,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:260
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -4068,91 +3936,107 @@ msgstr ""
 "lehentasun negatiboarekin konektatzean, EZ duzu mezurik jasoko "
 "zerbitzariarengandik. "
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4160,79 +4044,84 @@ msgstr ""
 "Lehentasuna zure egoeraren arabera aldatuko da. Lehentasunak autopriority_* "
 "aukeran ezarriak daude."
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, 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:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4240,125 +4129,130 @@ msgstr ""
 "Hautatuta badago, Gajim-ek zure IP eta definituriko proxy-ak erabiliko ditu "
 "file_transfer_proxies-en  fitxero transferentziarako."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP aktibatu al dago kontu honetarako?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Zuzentzeko erabili nahi dugun hizkuntza"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "dena edo espazio egoera banandua"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'bai', 'ez', edo 'biak'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'bai', 'ez' edo ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Kanpoan naiz bizitza disfrutatzen."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Libre."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Libre Hitz Egiteko."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Ez Erabilgarri."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Ez nahasi."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Agur!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4366,106 +4260,98 @@ 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:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Soinu bat ezarri MUC-eko edozein mezu iristean."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "arrantzale"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Ez izan da idle modulua kargatu"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Host okerra"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Erregistroaren informazioa transporteetarako %s ez da denboran iritsi"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard argitarapena egina"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Baimenik gabeko izengoitia: %s"
@@ -4473,77 +4359,77 @@ msgstr "Baimenik gabeko izengoitia: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Ezin da gela honetara sartu"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Honako gela honek ez du existitzen."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Gela sortzea mugatua dago."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Erregistratutako izengoitia erabilia izan behar da."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Ez zaude kideen zerrendan."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s -ra harpidetuak gaude orain"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s -ren harpidetzatik kenduta gaude"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4682,28 +4568,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Mezu hau *enkriptatua\" dago (Ikusi: JEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4712,154 +4598,154 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Manualki konektatu berriro."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Erantzun baliogabea"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "%s gordea"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "D-Bus bertsioa aurkitugabea: %s"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Mesedez begira ezazu zure izena eta pasahitza xehetasun handiz."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Errorea zerbitzarian sartzean.%s"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Kontaktua"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Ez bidali ikusezin egoerarengatik"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Begiratzaileak"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transportea"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 #, fuzzy
 msgid "Not in roster"
 msgstr "Ez dago zerrendan"
@@ -4869,39 +4755,57 @@ msgstr "Ez dago zerrendan"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#: ../src/common/dbus_support.py:54
+#, 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/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr ""
+"D-bus ez dago ordenagailu honetan edo python moduloak ez daude erabilgarri"
+
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Zerbitzua ez erabilgarri: Gajim ez dago abiarazita edota remote_control "
 "False egoeran dago"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Bus saioa ez dago erabilgarri.\n"
+"Saiatu irakurtzen http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Bus saioa ez dago erabilgarri.\n"
 "Saiatu irakurtzen http://trac.gajim.org/wiki/GajimDBus"
@@ -5069,240 +4973,277 @@ msgstr "Aste bukaera"
 msgid "Weekend!"
 msgstr "Asteburua!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Baliogabeko karakterea izenean."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Zerbitzariaren helbidea behar da."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Baliogabeko karakterea hostname -ean."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Invalid character in resource."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "Lan_petuta"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Lanpetuta"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "Ez E_rabilgarri"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "Libre _Hitz Egiteko"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Libre Hitz Egiteko"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Libre"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Libre"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Konektatzen"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Kanpoan"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Deskonektatuta"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Deskonektatuta"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "Ikuse_zin"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Ezin da jakin"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Errorea du"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Norentzat"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Biak"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Inork ez"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Harpidetu"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderatzaileak"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderatzailea"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Partaideak"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Bisitariak"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Bisitaria"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Inor ez"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Jabea"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administratzailea"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Partaidea"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "arreta jartzen ari da elkarrizketara"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "beste zerbait egiten ari da"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "mezuaren sorrera gelditua"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "tab edo lehioa itxi egin du"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gib"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bidali mezua"
 msgstr[1] "Bidali mezua"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Gelaren Konfigurazioa"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5312,17 +5253,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Berezko Egoera Mezuak"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Tamaina: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indeces"
@@ -6026,19 +6024,19 @@ msgstr ""
 msgid "Writing"
 msgstr "Lanean"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6046,12 +6044,12 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 #, fuzzy
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
@@ -6061,7 +6059,7 @@ msgstr ""
 "bertan behera utziko da."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6130,26 +6128,22 @@ 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:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Ezindu"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Berezko Egoera Mezuak"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Aktibatu"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "%s hizkuntzarako hiztegia ez dago erabilgarri"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6158,72 +6152,72 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Birkargatu orain?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Irakurri gabeko gertaerak"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Irakurri pendiente dituzun gertaera guztiak kontu hau ezabatu baino lehen. "
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Txat-a %s kontuan ireki duzu"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Kontu Izena Jadanik Erabilia"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6231,148 +6225,148 @@ msgstr ""
 "Izen hau jadanik zure kontaktu batengatik erabilita dago. Mesedez aukeratu "
 "beste izen bat."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "Kontuak moldatu"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Giltzaren Aukera"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Zure zerbitzariak ez du Vcard-ik onartzen"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Zerbitzariak ezin du zure informazio pertsonala gorde"
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Kontu izena jadanik badago"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Debekatutako Zerrenda"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Partaide Zerrenda"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Jabe Zerrenda"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Administratzaile Zerrenda"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Arrazoia"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Izengoitia"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Eginkizuna"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Debekatzen..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6380,11 +6374,11 @@ msgstr ""
 "<b>Zein nahi duzu debekatu?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Kidea ezartzen..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6392,11 +6386,11 @@ msgstr ""
 "<b>Zein nahi duzu kide egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Jabea ezartzen..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6405,11 +6399,11 @@ msgstr ""
 "<b>Zein nahi duzu jabe egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Administratzailea ezartzen..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6417,7 +6411,7 @@ msgstr ""
 "<b>Zein nahi duzu administratzaile egitea?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6434,60 +6428,88 @@ msgstr ""
 "4. zerbitzaria (the domain itself matches, as does any user@domain,\n"
 "domain/resource, or address containing a subdomain."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Enkriptazioa desaktibatuta"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Konexioak huts egin du"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Zer nahi duzu egitea?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Berezkoa"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "Denak"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Sarrerak eta irteerak bakarrik"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Denak"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6495,31 +6517,31 @@ msgstr ""
 "talde agenda hau ezabatzeaz"
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Baimenik gabeko izengoitia: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6527,34 +6549,34 @@ msgid ""
 "window."
 msgstr "Kontuko aukera aurreratuak ezarri ditzakezu Aurreratu botoila sakatuz."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6564,7 +6586,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6572,62 +6594,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktibatuta"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Lehen Mezu Jasoa"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Jasotako Hurrengo Mezua"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontaktua Konektatuta"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Mezua Bidaltzean"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Txat Taldeko Mezu Nabarmendua"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Txat Taldeko Mezua Jasotzean"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "GMail posta jasoa"
 
@@ -6645,45 +6667,45 @@ msgid ""
 "last time you paid attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "At_era"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr " \"%s\" -rako _aukerak"
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia Artikuloa"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Bila Ezazu _Hiztegian"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Web _Bilaketa "
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Ireki _lotura bezala"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6691,7 +6713,7 @@ msgstr[0] "Atzo"
 msgstr[1] "Atzo"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
@@ -6801,73 +6823,73 @@ msgstr "Yahoo! Helbide:"
 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:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Bezero ID Baliogabea"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "ID erabiltzaileak ez du baliabiderik eraman behar."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontaktua jadanik badago zerrendan"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ Bertsioa:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK Bertsioa:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Egungo diseinatzaileak: "
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Aurre diseinatzaileak: "
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "ESKERRAK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6878,108 +6900,108 @@ msgstr ""
 "%s hiztegia instalatu behar duzu zuzentzailea erabiltzeko, edota beste "
 "hizkuntz bat aukeratu speller_language aukera erabiliz."
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat Taldera Sartu %s kontuarekin"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, 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:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Baliogabeko izena"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID gela baliogabea"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "ID Jabber gelak ez du onartzen karaktererik."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Hau ez da txat talde bat"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s ez da txat gela baten izena."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Elkarrizketa Hasi %s kontuarekin"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Elkarrizketa Hasi"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6988,173 +7010,171 @@ msgstr ""
 "kontaktuaren Jabber ID-a edota izengoitia:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatuta zauden."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "JID Baliogabea"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Mezu Berria Bat"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Mezu Berri Bat"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Mezu Pribatu Berri Bat"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "E-Posta Berria"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Fitxero Transferitze Errorea"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Fitxero Transferitzea Egina"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Fitxero Transferentzia Gelditua"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Txat Taldeko Gonbidapena"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontaktu Egoera Aldaketa"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mezu Bakarra %s Kontua erabiliz"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mezu Bakarra %s Kontuan"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Mezu Bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Jasoa %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsola %s-rena"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr " XML Konsola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Stalled"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "_Eraldatu"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Ezabatu"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7162,156 +7182,156 @@ msgid ""
 msgstr "Nire kontaktu zerrendara nahi zaitut sartu."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Gehitu"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "_Eraldatu"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Ezabatu"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Taldea"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Nire zerrendara gehitu nahi zaitut."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Kontaktua _Sartu"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Debekatze Zerrenda <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Agindu: %s, ekintza: %s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Arau bat editatu</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ezarri Araua</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Debekatze Zerrenda %s-entzat"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Debekatze Zerrenda"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Baliogabeko izen zerrenda"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Izen bat sartu beharra duzu debekatze zerrenda bat egiteko."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "nagoenean"
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7319,38 +7339,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7360,77 +7380,77 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Besteak"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Solasaldiak"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Konektatu gabe ezin duzu zerbitzari erabilgarriak bilatu"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Zerbitzaria Aurkitua %s kontua erabiliz"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Zerbitzua Aurkitua"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Zerbitzua ezin izan da aurkitu"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7438,97 +7458,102 @@ msgstr ""
 "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
 "helbidea eta saiatu berriro."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du menurik begiratzeko."
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Baliogabeko izena"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Begiratzen %s  %s kontua erabiliz"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Bilatu"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "_Komandoa Exekutatu..."
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Deskribapena"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "_Talde Agendan Sartu Gela hau"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Talde agenda ezarria"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "\"%s\" gela zure talde agendan dago jadanik."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Talde agenda egoki sortu da"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 #, fuzzy
 msgid "Node"
 msgstr "Ezer ez"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Mezu berria"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "Harpidetza ezabat_u"
 
@@ -7577,7 +7602,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7743,103 +7768,91 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "Zerbitzariaren Ezaugarriak:"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Fitxeroa"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Denbora"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Prozesua"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Zu"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "%s gordea"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Fitxero transferentzia osatua"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Ireki Fitxeroaren Edukia"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Fitxero transferentzia ezeztatua"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Hartzailea: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Errore mezua: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Fitxero Transferentzia Gelditua"
@@ -7848,7 +7861,7 @@ msgstr "Fitxero Transferentzia Gelditua"
 msgid "Choose File to Send..."
 msgstr "Aukeratu Bidaltzeko Fitxeroa..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Deskribapena: %s"
@@ -7881,34 +7894,34 @@ msgstr "Deskribapena: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Ezin izan da gainarazi \"%s\" fitxeroa"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../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 ""
 "Izen honekin dagoeneko badago fitxerorik eta ez duzu baimenik gainarazteko."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Fitxero hau jadanik badago"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "\"%s\" kokapena ez da idazgarria"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Ez duzu baimenik kokapen honetan fitxerorik sortzeko."
 
@@ -7944,74 +7957,57 @@ msgstr "Fitxeroa:"
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Etena"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Jarraitu"
+
+#: ../src/gajim.py:141
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ rutinak ez du libglade sostengatzen"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"GTK+ rutina ezabatu eta instalatu ezazu azken bertsio establea %s hemendik"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Konproba ezazu GTK+ eta  PyGTK  libglade onartzen dutea zure sistemak."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim-ek  pywin32  behar du abiarazteko"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8021,11 +8017,11 @@ msgstr ""
 "dezakezu hau."
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim dagoeneko abiarazi da"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8070,8 +8066,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "kontua"
 
@@ -8093,12 +8089,15 @@ msgid "status"
 msgstr "egoera"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "mezua"
 
@@ -8335,80 +8334,98 @@ msgstr ""
 "Xml-a bidaliko den kontua ez badako zehaztuta, kontu guztietara bidaliko da"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "mezuaren edukia"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Gela Berri Sartu"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "room"
 msgstr "-etik"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Gela:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "nick"
 msgstr "Izengoitia"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Izengoitia aurkitugabea: %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "password"
 msgstr "Pasahitza:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Mesedez begiratu avahi-daemon martxan dagoen."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Erakutsi edo ezkutatu zerrenda leihoa"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Galdutako argumentua  \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8417,31 +8434,31 @@ msgstr ""
 "'%s'  ez dago zure zerrendan.\n"
 "Kontua zehaztu mezua bidaltzeko."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Ez duzu aktibatutako konturik"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumentuak:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s ez da aurkitu"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8450,7 +8467,7 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8459,7 +8476,7 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8468,7 +8485,11 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Host okerra"
@@ -8499,198 +8520,199 @@ msgstr "Ezin duzu zure berezko gaia ezabatu"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Mezu pribatua bidaltzeak huts egin du"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Sartu Izengoitia"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Elkarrizketaren Historiala"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Konektatu"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afizioak: "
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s gelan sartu da"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 orain dago %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "E_z galdetu berriro  "
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Gaia Aldatu"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Gai berria zehaztu:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Izengoitia Aldatu"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Mesedez zehaztu ezazu erabili nahi duzun izengoiti berria:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Botatzen %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Arrazoia zehaztu behar duzu behean:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Debekatzen %s"
@@ -8711,60 +8733,60 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Report Bug"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Zehaztapenak"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Gehigarriak ez eskuragarri"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Gorde Irudia Bezala..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8774,165 +8796,165 @@ msgstr ""
 "Zuk aukeratutako izengoitia erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste izengoiti bat:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Konexioak huts egin du"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errorea bidaltzen zen bitartean %s ( %s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Harpidetza Eskaria"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza ezabatu dizu"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Harpidetza ezabat_u"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "E-posta Berria %(gmail_mail_address)s -en"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8942,103 +8964,104 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Zerrendatik kontaktua ezabatu"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Mezu _guztietan"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Mesedez ezarri erabiltzaile izen berri bat kontu lokalerako"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Erabiltze izenarekin gatazka"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fitxeroa Transferitzeko Baimena"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9046,15 +9069,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9065,90 +9088,100 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Konektatu"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr "Metakontaktu bat sortuko duzu. Jarraitu nahi al duzu?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Enkriptazioa desaktibatuta"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "%s konektatu behar zara OpenPGP-rik gabe."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
 
@@ -9157,44 +9190,44 @@ msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
 msgid "_New Group Chat"
 msgstr "Txat Taldea Berria"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Nire zerrendara nahi nizuke sartu"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Ezin izan da aurkitu log-en datu basea"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontaktua"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Izengoitia"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Mezua"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9208,27 +9241,27 @@ msgstr ""
 "\n"
 "BAI sakatu baduzu, mesedez itxoin..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Historialeko Log-ak Esportatzen...."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Itzulgaitza den operazio bat da hau."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9267,38 +9300,38 @@ msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/message_window.py:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Txat-ak"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Txat Taldeak"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Txat Pribatuak"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Mezuak"
 
@@ -9310,22 +9343,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Egoera Aldatu du"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Konektatuta"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Deskonektatuta"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
@@ -9350,7 +9383,7 @@ msgstr "Mezu Berria %(nickname)s -etik"
 msgid "New Message from %(nickname)s"
 msgstr "Mezu Berria %(nickname)s -etik"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "bederatzi"
@@ -9359,12 +9392,12 @@ msgstr "bederatzi"
 msgid "Retrieving profile..."
 msgstr "Profila jasotzen..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "Fitxeroaren tokia"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "Honako gela honek ez du existitzen."
@@ -9372,7 +9405,7 @@ msgstr "Honako gela honek ez du existitzen."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
@@ -9404,51 +9437,51 @@ msgstr ""
 "Errore bat agertu da zure informazio pertsonala argitaratzen zen bitartean, "
 "saiatu berriro beranduago."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "%s konektatu behar zara OpenPGP-rik gabe."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9456,44 +9489,55 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Fitxategi transferentzia kantzelatu"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, 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:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Irakurri behar dituzu transporte hau ezabatu baino lehen."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9502,11 +9546,11 @@ msgstr ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transporteak ezabatuko dira"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9515,69 +9559,69 @@ msgstr ""
 "Ezin izango duzu transporte hauetako kontaktuen mezuak jaso ezta bidali ere: "
 "%s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 #, 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:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Berridatzi Kontaktua"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Sartu %s kontaktuarentzat nick berri bat"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Berrrizenpetu Taldea"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Sartu %s taldearentzat izen berri bat"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Ezabatu Taldea"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Zerrendatik talde honetako kontaktu guztiak ere ezabatu"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP Kodea Izendatu"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9586,12 +9630,12 @@ msgstr ""
 "deskonektatuta ikusiko zaitu beti."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Zer nahi duzu egitea?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9599,16 +9643,16 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktuak ezabatuak izango dira zure zerrendatik"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9618,33 +9662,33 @@ msgstr ""
 " bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak deskonektatuta "
 "ikusiko zaitu beti."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metacontacts storage not supported by your server"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9653,12 +9697,12 @@ msgstr ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be save on next reconnection."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../src/roster_window.py:4116
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9669,24 +9713,24 @@ msgstr ""
 "kontaktuak jabber kontu bat baino gehiago duenean edo transporteetan "
 "harpidetuta dagonean erabiltzen da. "
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Fitxero Baliogabea"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Bidali %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
@@ -9696,134 +9740,138 @@ msgstr "Egin %s eta %s metacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz "
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Talde Agenda _Moldatu..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "%s kontukoa"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Argitaratu"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Argitaratu"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Zerbitzuak Aurkitu..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "_Bidali Taldeari Mezua"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Kontaktu guztiei"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Konektatutako kontaktu guztiei"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Berridatzi Kontaktua"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Bidali Mezu Bakarra"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Komandoa Exekutatu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportea"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Trans_porteak Erakutsi"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Kontaktua Deskonektatuta"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Kontaktua Deskonektatuta"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Historial Administratzailea"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "T_xat Talde Berrian Sartu"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
@@ -9858,9 +9906,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9873,119 +9921,129 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Ez dago zerrendan"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Ezkutatu Menua"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Baliabideak: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Egoera: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Azken egoera: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " %s-etik"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "Konektatu"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "Kontaktua Deskonektatuta"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Harpidetza: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Mota:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Kontu Eraldaketa"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Deskargatu"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Kargatu"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Mota: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Osatua"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "Gelditua"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio zehaztuz."
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9993,30 +10051,30 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "noiztik %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplikazioak</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10024,7 +10082,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10032,31 +10090,340 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 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:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
+#, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Txat Taldean _Sartu"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Kontaktua Gehitu..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Zerbitzuak Aurkitu"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Komandoa Exekutatu..."
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "Kontua E_raldatu"
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Informazio Pertsonala "
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "Elkarrizketa  _Hasi"
+
+#~ msgid "_Status"
+#~ msgstr "_Egoera"
+
+#~ msgid "Account Modification"
+#~ msgstr "Kontu Eraldaketa"
+
+#~ 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 ""
+#~ "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"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Informazio Pertsonala Editatu..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Hostname: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Hautatua badago, Gajim-ek pasahitzak  ~/.gajim/config gordeko ditu "
+#~ "irakurtzeko baimena zuk bakarrik izanik"
+
+#~ msgid "Port: "
+#~ msgstr "Portua: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Gorde _pasa-esaldia(ez trinkoa)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Bidali keep-alive paketeak"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Erabili _SSL(Legacy)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "Egoerarekin b_at egin"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Ezabatu MOTD"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Bidali Zerbitzarira Mezua"
+
+#, fuzzy
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Mezu bat Jasoa\n"
+#~ "Kontaktua Konektatua\n"
+#~ "Kontaktua Deskonektatua\n"
+#~ "Kontaktuak Egoeraz Aldatua\n"
+#~ "Txat Taldeko Mezu bat Bistaratua\n"
+#~ "Txat Taldeko Mezu bat Jasoa\n"
+#~ "Fitxero Transferentzia Eskatua\n"
+#~ "Fitxero Transferentzia Hasia\n"
+#~ "Fitxero Transferentzia Bukatua"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontaktua(k)\n"
+#~ "taldea(k)\n"
+#~ "denak"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Txat Taldean _Sartu"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopiatu JID/Email-a"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Lotura kokapena kopiatu"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Ireki E-posta Konposatzailea"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "Web-ean _Ireki Lotura"
+
+#~ msgid "_Start Chat"
+#~ msgstr "Elkarrizketa  _Hasi"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Kontu zerrenda\n"
+#~ "Talde zerrenda\n"
+#~ "Kontaktu zerrenda\n"
+#~ "Banner Elkarrizketa "
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "Aldatu _Izengoitia"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "Aldatu _Gaia"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Gela Konfigu_ratu"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Talde Agenda Moldatu"
+
+#~ msgid "Send _File"
+#~ msgstr "Bidali _Fitxeroa"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Zerrendara Sartu"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Bidali Mezu Pribatu bat"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Kontuak moldatu"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "Ezabatu"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Zerrendara kontaktua sartu"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Talde Agendan Sartu Gela hau"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Aldatu _Izengoitia"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "arreta jartzen ari da elkarrizketara"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Sakatu emoticon bat ezartzeko (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Elkarrizketa guztien egoera\n"
+#~ "Konposatzen bakarrik\n"
+#~ "Desaktibatuta"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Autodetektatu Gajim abiarazten den bakoitzean\n"
+#~ "Beti GNOME-ren berezko aplikazioak erabili\n"
+#~ "Beti KDE-ren berezko aplikazioak erabili\n"
+#~ "Beti Xfce-ren berezko aplikazioak erabili\n"
+#~ "Bezeroa"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ezer\n"
+#~ "biak\n"
+#~ "nondik\n"
+#~ "norentzat"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Ezabatu"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "_Kontaktua Gehitu..."
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "Zerbitzariaren Ezaugarriak:"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Fitxero _Transferentzia"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profila, A_batarea"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Kontuak"
+
+#~ msgid "_Contents"
+#~ msgstr "_Edukiak"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Hobespenak"
+
+#~ msgid "_Quit"
+#~ msgstr "At_era"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Bidali _Mezu Bakarra..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Bidali _Mezu Bakarra"
+
+#~ msgid "Sta_tus"
+#~ msgstr "E_goera"
+
+#~ msgid "_Group Chat"
+#~ msgstr "Txat _Taldea"
+
+#~ msgid "Enable"
+#~ msgstr "Aktibatu"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "Kontua E_ditatu"
+
+#~ msgid "Wrong host"
+#~ msgstr "Host okerra"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ rutinak ez du libglade sostengatzen"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "GTK+ rutina ezabatu eta instalatu ezazu azken bertsio establea %s hemendik"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Konproba ezazu GTK+ eta  PyGTK  libglade onartzen dutea zure sistemak."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim-ek PySQLite2 behar du abiarazteko"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Sarrerako mezua:"
 
@@ -10251,10 +10618,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Gajim account %s"
 #~ msgstr "%s gajim kontua"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Bezeroak</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Bikoiztutako Jabber ID "
 
@@ -10334,9 +10697,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo eta Juliet</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Old stories"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquy"
 
@@ -10446,9 +10806,6 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "Orain duzun  playing _music  pista jarri egoera mezu bezala"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Ikusi _zerrendan bakarrik"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Automatikoki kanpoko egoera mezua"
 
@@ -10486,18 +10843,9 @@ msgstr "baliabidea lehentasunarekin: "
 #~ msgid "_Before time:"
 #~ msgstr "Ordua _baino lehen:"
 
-#~ msgid "_Never"
-#~ msgstr "_Inoiz"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Jakinarazi horri buruz"
-
 #~ msgid "_Player:"
 #~ msgstr "_Entzun"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Agertarazi"
-
 #~ msgid "Address"
 #~ msgstr "Helbidea"
 
diff --git a/po/fr.po b/po/fr.po
index 72bb42a47..e5be1c92b 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: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-11-15 15:50+0100\n"
 "Last-Translator: Florent Le Coz <louizatakk@fedoraproject.org>\n"
 "Language-Team: <>\n"
@@ -22,59 +22,11 @@ msgstr ""
 "X-Poedit-Basepath: /home/louiz/gajim\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un client Jabber en GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "_Rejoindre un _salon de discussion..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Ajouter un contact..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Découvrir les services"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Exécuter une commande..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Modifier le compte"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Accéder au compte Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "Évènements P_ersonnels"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "Commencer une _discussion..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "É_tat"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -84,23 +36,23 @@ msgstr ""
 "\n"
 "Veuillez patienter..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Choisissez une des options suivantes :</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Remplissez les informations pour votre compte</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Veuillez choisir un serveur</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -108,58 +60,65 @@ msgstr ""
 "Ajouter ce certificat à la liste des certificats de confiance.\n"
 "Empreinte digitale SHA1 du certificat :\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Authentification anon_yme"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Se connecter quand je clique sur Finir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "J'ai déjà un compte que je veux _utiliser"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Je veux _créer un nouveau compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 ""
 "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Gérer..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Aucun"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y :"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Sauver le mot de _passe"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Définir mon profil quand je me connecte"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Utiliser un nom d'hôte/port personnalisé"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -167,148 +126,142 @@ msgstr ""
 "Vous devez avoir un compte pour vous connecter\n"
 "au réseau Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Avancées"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Finir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "Nom d'_Hôte :"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "Identifiant _Jabber : "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "Mot de _passe : "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Serveur :"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Divers</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informations personnelles</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Modification du compte"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Comptes"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Opérations d'administration"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Authentification anonyme"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Reconnexion automatique quand la connexion est perdue"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnexion au démarrage"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Chan_ger le mot de passe"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Si vous cochez cette case, Gajim se connectera sur le port 5223, sur lequel "
-"les serveurs sont supposés gérer le SSL. Notez que Gajim utilise le "
-"chiffrement TLS par défaut si le serveur annonce qu'il le supporte, et avec "
-"cette option vous désactivez le TLS"
+"Cochez cette case pour que Gajim vous demande avant d'envoyer votre mot de "
+"passe via une connexion non-sécurisée"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Choisissez une _clé..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Cliquez pour changer le mot de passe du compte"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Cliquez pour demander l'autorisation à tous les contacts d'un autre compte"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onnexion au démarrage de Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Connexion"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "_Éditer les informations personnelles..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Courriel :"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Prénom :"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Général"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Serveur :"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -316,8 +269,13 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -325,16 +283,7 @@ msgstr ""
 "Si coché, Gajim enverra des paquets de maintien de connection pour prévenir "
 "des temps de latence pouvant entraîner des déconnexions"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Si cette case est cochée, Gajim va stocker le mot de passe dans ~/.gajim/"
-"config avec accès en lecture pour vous uniquement"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -342,8 +291,7 @@ msgstr ""
 "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement "
 "à jabber en utilisant ce compte"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -353,47 +301,50 @@ msgstr ""
 "l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état "
 "de ce compte"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Les informations vous concernant, stockées sur le serveur"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 "Identifiant Jabber :"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Nom :"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Regrouper les comptes"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Aucun"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port : "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_té :"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -403,22 +354,20 @@ msgstr ""
 "é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/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "La priorité va changer automatiquement selon votre état."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy :"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Re_nommer"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Ressour_ce: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -432,202 +381,89 @@ msgstr ""
 "même temps. La ressource avec la plus haute priorité recevra les messages "
 "(voir plus bas)."
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Enregistrer votre mot de _passe (non sécurisé)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Garder l'_historique des conversations pour tous les contacts"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Envoi des paquets de maintien de connexion"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Envoi des pa_quets de maintien de connexion"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "S_ynchroniser l'état du compte avec l'état global"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Synchroniser les contacts"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Utiliser _SSL"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Utiliser les proxies pour les transferts de fichiers"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Ajuster selon l'état"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Nom :"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "_Ajuster selon l'état"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Comptes"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Authentification anonyme"
-
-#: ../data/glade/accounts_window.glade.h:13
-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/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "C_onnexion au démarrage de Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Courriel :"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Prénom :"
-
-#: ../data/glade/accounts_window.glade.h:24
-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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Identifiant Jabber :"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Nom :"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Regrouper les comptes"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Re_nommer"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Envoi des pa_quets de maintien de connexion"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "S_ynchroniser l'état du compte avec l'état global"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Synchroniser les contacts"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Utiliser un Agent G_PG"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Utiliser un nom d'hôte/port personnalisé"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Utiliser un port pers_onnalisé :"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Utiliser les proxies pour les transferts de fichiers"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Éditer les informations personnelles…"
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "Activ_er"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "Nom d'_Hôte :"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Gérer..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port :"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Prévenir avant d'utiliser une connexion non sécurisée"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_utiliser la variable d'environnement HTTP__PROXY"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Compte :"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Ajouter un nouveau contact"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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 "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../data/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -639,7 +475,7 @@ msgstr ""
 "protocole. Pour ce faire, cliquez sur le\n"
 "bouton « souscrire »."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -647,411 +483,468 @@ msgstr ""
 "Vous devez être connecté à la passerelle pour\n"
 "pouvoir ajouter un contact de ce protocole."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Groupe :"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Surnom :"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protocole :"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Souscrire"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../data/gui/add_new_contact_window.ui.h:15
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "_Autorisation"
+
+#: ../data/gui/add_new_contact_window.ui.h:16
 msgid "_User ID:"
 msgstr "_Identifiant :"
 
-#: ../data/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Une erreur est survenue :</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Commande à exécuter :</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Commandes Ad-hoc - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Revérifier"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Description de l'erreur..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr ""
 "Merci de patienter pendant la récupération de la liste des commandes..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Merci de patienter pendant l'envoi de la commande..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Veuillez patienter..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Cette entité jabber n'affiche pas de commandes."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Description</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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> Vous devriez redémarrer Gajim pour prendre en compte certaines "
 "de vos modifications."
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Éditeur de configuration avancée"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtre :"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Supprimer MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Supprime le message du jour"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Éditer les Listes _privées..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Envoie un message aux utilisateurs actuellement connectés à ce serveur"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Définir MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Mets un message du jour"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Montrer la console _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Mettre à jour MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Mets à jour le message du jour"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrateur"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Envoyer un message au serveur..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr "une fenêtre ou un onglet ouvert avec ce contact "
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Actions</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Conditions</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Actions avancées"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Éditeur de configuration avancée"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Tous les états"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Absent(e)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Occupé(e) "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../data/gui/advanced_notifications_window.ui.h:10
+#, fuzzy
+msgid "Contact Change Status "
+msgstr "Le contact a changé d'état"
+
+#: ../data/gui/advanced_notifications_window.ui.h:11
+#, fuzzy
+msgid "Contact Disconnected "
+msgstr "Contact déconnecté"
+
+#: ../data/gui/advanced_notifications_window.ui.h:12
 msgid "Don't have "
 msgstr "N'ai pas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:11
+#: ../data/gui/advanced_notifications_window.ui.h:13
+#, fuzzy
+msgid "File Transfer Finished"
+msgstr "Transfert de fichiers"
+
+#: ../data/gui/advanced_notifications_window.ui.h:14
+#, fuzzy
+msgid "File Transfer Request "
+msgstr "Requête de transfert de fichier"
+
+#: ../data/gui/advanced_notifications_window.ui.h:15
+#, fuzzy
+msgid "File Transfer Started "
+msgstr "Transfert de fichier interrompu"
+
+#: ../data/gui/advanced_notifications_window.ui.h:16
+#, fuzzy
+msgid "Group Chat Message Highlight "
+msgstr "Message d'un salon mis en surbrillance"
+
+#: ../data/gui/advanced_notifications_window.ui.h:17
+#, fuzzy
+msgid "Group Chat Message Received "
+msgstr "Message reçu dans un salon"
+
+#: ../data/gui/advanced_notifications_window.ui.h:18
 msgid "Have "
 msgstr "Ai"
 
-#: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Lancer une commande"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Non disponible"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Un ou plusieurs états spéciaux..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "En ligne / Disponible pour discuter"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Jouer un son"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Réception d'un message\n"
-"Contact déconnecté \n"
-"Changement de l'état du contact \n"
-"Surbrillance des messages dans les salons \n"
-"Réception d'un message dans un salon \n"
-"Demande de transfert de fichier \n"
-"Transfert de fichier lancé \n"
-"Transfert de fichier complété"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/gui/advanced_notifications_window.ui.h:25
+#, fuzzy
+msgid "Receive a Message"
+msgstr "Nouveau message privé"
+
+#: ../data/gui/advanced_notifications_window.ui.h:26
 msgid "When "
 msgstr "Quand"
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 "_Activer l'indice d'urgence du gestionnaire de fenêtres pour faire clignoter "
 "la fenêtre de discussion dans la liste des fenêtres"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Désactiver l'ouverture automatique de fenêtres de conversation"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Désactiver la fenêtre popup existante"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Désactiver le son existant pour cet événement"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Désactiver l'affichage des événements dans la liste de contacts"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Désactiver l'affichage des événements dans la zone de notification."
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "M'av_iser avec une fenêtre popup"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Ouvrir une fenêtre de conversation"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "Ne le montrer que dans la _liste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "L'afficher dans la zone de notifications"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "et je "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"contact(s)\n"
-"groupe(s)\n"
-"tous"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "pour "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/gui/advanced_notifications_window.ui.h:41
+#, fuzzy
+msgid "group(s)"
+msgstr "Groupes"
+
+#: ../data/gui/advanced_notifications_window.ui.h:42
 msgid "when I'm in"
 msgstr "lorsque je suis là"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Article :"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Nom du fil :"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Dernière modification :"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Nouvel événement reçu"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Vous avez publié l'article :"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Contacts Bloqués"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Message :</b> "
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Définir l'Activité"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Publier une activité"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Message :</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Humeur :</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Entrez le à nouveau pour confirmer :"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Entrez un nouveau mot de passe :"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Activité :"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Humeur :"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Messages prédéfinis :"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Enregistrer comme messages d'état prédéfini..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Rejoindre un _salon de discussion"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Ajouter à la liste de contacts..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Copier l'identifiant Jabber / l'adresse électronique"
+#: ../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:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Copier l'adresse du lien"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Ouvrir le logiciel de courriel"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Ouvrir le lien dans votre navigateur"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "Commencer une _discussion"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "En_voyer"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "In_viter"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Inviter des Amis !"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "Serveur de salon"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../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/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1059,189 +952,187 @@ msgstr ""
 "Vous allez commencer une Conversation Groupée.\n"
 "Sélectionnez les contacts que vous voulez inviter"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "Demander à voir son état"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Ajouter une _Notification Spéciale..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Assigner une clé Open_PGP..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "E_xécuter une commande…"
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Éditer les _groupes..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "In_viter à"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Inviter des _Contacts"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "Suppri_mer"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Envoyer un Statut Personnalisé"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Envoyer un _message simple..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Envoyer un _fichier..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Définir un _Avatar personnalisé..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Commencer une _discussion"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Activer le chiffrement de bout en bout"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Activer le chiffrement _GPG"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Ajouter à la liste de contacts..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "L'autoriser à voir mon état"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Bloquer"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "Interdire de voir mon état"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historique"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignorer"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Gérer le Contact"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Renommer..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Autorisation"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Débloquer"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Ne plus ignorer"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Remplissez le formulaire."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configuration du salon de discussion"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Éditer les groupes"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(Info <b>ESession</b>)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Vérifier"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Fonctionnalités"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Annule le transfert de fichier"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Annule le transfert du fichier sélectionné"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Nettoyer"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Transfert de fichiers"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Cache la fenêtre"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Supprimer le transfert de fichier de la liste."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1249,77 +1140,76 @@ 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/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 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/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Continuer"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "Me _signaler quand un transfert de fichier est terminé"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Ouvrir le répertoire de destination"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "liste des transferts de fichier"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Couleurs des Onglets</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Compte\n"
-"Groupe\n"
-"Contact\n"
-"Bannière"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Compte"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Gras"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "En train d'écrire"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Contact"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Style de la police :"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Personnalisation des thèmes de Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Parti"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Groupe"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactif"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Italique"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1327,7 +1217,7 @@ msgstr ""
 "Messages\n"
 "de salon"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1336,109 +1226,73 @@ msgstr ""
 "dirigés dans\n"
 "les salons"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pause"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Couleur du texte :"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Police du texte :"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Arrière-plan :"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Changer de Sur_nom..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Changer le _Sujet..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Configurer le _Salon..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Marque-pages"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Détruire le Salon"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Gérer le Salon"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimiser à la fermeture"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_dérer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Actions des Occupants"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Envoyer un _fichier"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Ajouter à la liste de contacts"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Administrateur"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Bannir"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Éjecter"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Membre"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "Pr_opriétaire"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Envoyer un message privé"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_S'exprimer"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Rédiger un article"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Sujet"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1449,25 +1303,19 @@ msgstr ""
 "lancé. Évitez les suppressions de contacts avec qui vous êtes en train de "
 "parler."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Bienvenue dans le Gestionnaire d'Archives Gajim</b></big>"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Supprimer"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Exporter"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gestionnaire d'historique de Gajim"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1483,401 +1331,419 @@ msgstr ""
 "sélectionner les archives à droite et/ou chercher dans la base de donnée en "
 "bas."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Rechercher dans la base de données"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../data/gui/history_window.ui.h:1
+#, fuzzy
+msgid "All Chat Histories"
+msgstr "Tous les états"
+
+#: ../data/gui/history_window.ui.h:2 ../src/history_window.py:323
 msgid "Conversation History"
 msgstr "Historique de conversation"
 
-#: ../data/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Entrez un identifiant Jabber ou un nom\n"
-"Historiques de conversations groupées\n"
-"Tous les Historiques"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Nom du contact"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Salons de discussion"
+
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Chercher :"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Historique de conversation"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Enregistrer ce salon dans les marque-pages"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Parcourir"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:4
+#, fuzzy
+msgid "Join this room _automatically when I connect"
 msgstr "Joindre ce salon de discussion quand je me connecte"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Surnom :"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Récemment :"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Salon de discussion :"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Serveur :"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Enregistrer ce salon dans les marque-pages"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "Re_joindre"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Gérer les comptes"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Rejoindre automatiquement"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gérer les marque-pages"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimiser automatiquement"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Afficher l'état :"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Serveur :"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Titre :"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Configuration du Service PEP"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Configurer"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Propriétés</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Paramètres</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
+#, fuzzy
+msgid "HTTP Connect"
 msgstr ""
 "Connexion HTTP\n"
 "SOCKS5\n"
 "BOSH"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gérer les profils de proxies"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Mot de passe : "
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Hôte du proxy :"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "_Port du proxy :"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Utiliser un prox_y HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Utiliser l'auth_entification"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL :"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Nom :"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Type : "
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Nom :"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Ajouter le contact à la liste de contacts (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Enregistrer ce salon dans les marque-pages (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Parcourir l'historique des conversations (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Changer le sujet du salon (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Changer votre surnom (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Inviter des contacts dans la conversation (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Envoyer un fichier (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Afficher une liste des émoticônes (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Afficher une liste de styles"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Affiche un menu de fonctions avancées (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Afficher le profil du contact (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr "Démarrer/arrêter une session audio"
-
-#: ../data/glade/message_window.glade.h:13
-msgid "Toggle video session"
-msgstr "Démarrer/arrêter une session vidéo"
-
-#. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "En_voyer"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Mot de passe"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Éditeur de configuration avancée</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Applications</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Actions</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Statut Automatique</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Apparence des conversations</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Couleurs des messages</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notifications visuelles</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Conditions</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Paramètres personnalisés</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Police d'écriture</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Paramètres Gmail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Messages d'état prédéfinis</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Vie privée</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Apparence de la fenêtre principale</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Messages d'état prédéfinis</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Thèmes</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Deuxième :</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notifications visuelles</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avancées"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Avancées..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Tous les états\n"
-"En train de composer seulement\n"
-"Aucun"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Tous les états"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Envoyer des informations concernant votre _système d'exploitation"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Envoyer des informations concernant votre _système d'exploitation"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Autoriser les sons quand je suis _occupé(e)"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Absent(e)"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Toujours utiliser les applications OS/X par défaut."
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Toujours utiliser les applications OS/X par défaut."
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Toujours utiliser les applications OS/X par défaut."
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Demander le message d'état lorsque je me : "
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr "Audio / Vidéo"
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Détection automatique à chaque démarrage\n"
-"Toujours utiliser les applications par défaut de GNOME\n"
-"Toujours utiliser les applications par défaut de KDE\n"
-"Toujours utiliser les applications par défaut de Xfce\n"
-"Personnalisé"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "C_onnexion au démarrage"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Message de conversation :"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Vérifier que Gajim est le client Jabber par _défaut au démarrage"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "En train d'écrire"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Paramétrer la couleur et la police de texte de l'interface"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Contact's message:"
 msgstr "Le message du contact :"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Contact's nickname:"
 msgstr "Le pseudo du contact :"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Personnalisé"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
-"Conversations séparées et Roster séparé\n"
-"Fenêtre de conversation unique, Roster séparé\n"
-"Fenêtre unique pour tout\n"
-"Conversations par compte et Roster séparé\n"
-"Conversations par type et Roster séparé"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Désactivé"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Afficher l'_activité des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Afficher des informations détaillées de courriels"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Afficher l'humeur des contacts dans la liste des contacts"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Afficher ce que mes contacts écoutent"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Afficher l'a_vatar des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Afficher l'humeur des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Afficher les _messages d'état des contacts dans la liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1887,7 +1753,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quels états de conversation vous voulez envoyer à vos contacts."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1897,7 +1763,7 @@ msgstr ""
 "conversations que vous pouvez avoir avec un contact. Vous pouvez ici "
 "spécifier quel état de conversation vous voulez envoyer à vos contacts."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1905,11 +1771,11 @@ msgstr ""
 "Gajim vous signalera par une fenêtre de notification en bas à droite de "
 "l'écran qu'un contact s'est déconnecté"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Cacher tous les boutons dans les fenêtres de conversations"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1917,7 +1783,7 @@ msgstr ""
 "Si cette case est cochée, Gajim autorisera les autres à détecter le système "
 "d'exploitation que vous utilisez"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1925,14 +1791,14 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera également des informations à "
 "propos de l'expéditeur des nouveaux courriels"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Si cette case est cochée, Gajim changera votre statut en Absent(e) quand "
 "l'ordinateur est inutilisé."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1940,7 +1806,7 @@ msgstr ""
 "Si cette case est cochée, Gajim changera votre statut en Non disponible "
 "quand l'ordinateur n'a pas été utilisé pendant une plus longue période"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1948,7 +1814,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/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"
@@ -1956,28 +1822,36 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale et les salons"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera l'activité des contacts dans votre "
 "liste des contacts"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location 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:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera l'humeur de chaque contact dans "
 "votre roster"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera ce que chaque contact écoute dans "
 "votre roster"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1988,7 +1862,7 @@ msgstr ""
 "définie explicitement par clique droit sur le champ de saisie, la langue par "
 "défaut sera utilisée pour ce contact ou ce salon."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1998,7 +1872,7 @@ msgstr ""
 "contacts non autorisés. Utilisez avec précaution car cela bloque tous les "
 "messages provenant des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -2008,7 +1882,7 @@ msgstr ""
 "Veuillez noter qu'en utilisant une encryption E2E, l'utilisateur distant "
 "doit l'accepter, sinon les messages ne seront pas archivés."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2016,7 +1890,7 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera une notification quand un nouveau "
 "courriel GMail est reçu"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2026,7 +1900,7 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent(e), occupé(e), etc.)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2034,7 +1908,7 @@ msgstr ""
 "Si cette case est cochée, Gajim ne demandera pas de message de statut. Le "
 "message par défaut sera utilisé à la place."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2042,79 +1916,101 @@ msgstr ""
 "Si cette case n'est pas décochée, Gajim va remplacer les émoticônes ASCII "
 "comme « :) » par un équivalent graphique statique ou dynamique"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Archiver les conversations _chiffrées"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Rendre les fenêtres de conversation _compactes"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "_Gérer..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Jamais\n"
-"Seulement lorsqu'il y a des évènements en attente\n"
-"Toujours"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Serveur"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Notifications"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Me signaler les contacts qui se _connectent"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Me signaler les contacts qui se _déconnectent"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Me signaler les contacts qui se _déconnectent"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "M'avertir lors de l'arrivée d'un courrier électronique _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Jamais\n"
+"Seulement lorsqu'il y a des évènements en attente\n"
+"Toujours"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Événements Personnels"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "_Jouer les sons"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
 msgstr ""
-"L'afficher dans un popup\n"
-"Afficher une notification\n"
-"Afficher uniquement dans le Roster"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Préférences"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Serveur :"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Ne le montrer que dans la _liste"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Afficher l'icône de notifications :"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2122,27 +2018,27 @@ msgstr ""
 "Certains messages peuvent contenir du texte complexe (formatage, couleurs, "
 "etc.). Si activé, Gajim l'affichera seulement en tant que texte non formaté. "
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Trier les contacts par état"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "État"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "_Icônes d'état :"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Style"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "T_hème :"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2154,7 +2050,7 @@ msgstr ""
 "$S sera remplacé par l'ancien message de statut\n"
 "$T sera remplacé par le temps d'absence"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2166,364 +2062,379 @@ msgstr ""
 "$S sera remplacé par l'ancien message de statut\n"
 "$T sera remplacé par le temps de non-activité"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Utiliser les icônes des passere_lles"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Utiliser la valeur par _défaut"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Quand un nouvel événement est reçu :"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your message:"
 msgstr "Votre message :"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 msgid "Your nickname:"
 msgstr "Votre pseudo :"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "Passer _Absent(e) après :"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Afficher les notifications d'état :"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "É_moticônes :"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "Gestionnaire de _fichiers :"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorer le formatage complexe du texte dans les messages entrants"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "Inscrire dans l'_historique les changements d'état des contacts"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "Logiciel de courriel :"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "Passer _indisponible après :"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Ouvrir..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "Utilise_r les couleurs par défaut"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Envoyer les notifications d'état :"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "Message d'état :"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "Mise à valeur des _URL :"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "Comportement de la _fenêtre :"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "dans les _salons de discussion"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "dans le _roster"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutes"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Listes privées :"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Ajouter / modifier une règle</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Liste des règles</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Liste privée</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Actif pour cette session"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Actif a chaque démarrage"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Tous"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Tout (y compris les abonnements)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permettre"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Refuser"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "Identifiant Jabber :"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Ordre :"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Liste privée"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "tous par état d'inscription"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "tous ceux dans le groupe"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"aucun\n"
-"les deux\n"
-"De\n"
-"À"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Les deux"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "De"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "un"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "deux"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "à m'envoyer des messages"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "à m'envoyer des requêtes"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "à m'envoyer son état"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "à voir mon état"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresse</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar :</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Ville :</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Entreprise :</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Pays :</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Département :</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>Courriel :</b>"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Adresse 2 :</b>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Nom de Famille :</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Nom complet</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Prénom :</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Site perso :</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Deuxième :</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Nom :</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Surnom :</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Téléphone :</b>"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Position :</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Code postal :</b>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Préfixe :</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Rôle :</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Région :</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Rue :</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffixe :</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "À propos"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Cliquez pour choisir votre avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "Format : AAAA-MM-JJ"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Informations personnelles"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Emploi"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Que voulez vous faire ?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Supprimer le compte de Gajim _uniquement"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Supprimer le compte de Gajim et du _serveur"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2531,192 +2442,143 @@ msgstr ""
 "<b>quelqu'un@quelquepart.com</b> aimerait que vous <b>ajoutiez</b> quelques "
 "contacts à votre roster."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../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/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Échange d'item du roster"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "_Ajouter un contact..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Fonc_tionnalités"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Transfert de fichiers"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Foire Aux Questions (en ligne)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Aide en ligne"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil et _avatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Afficher seulement les contacts _Actifs"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Afficher les Passerelles"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Afficher les Contacts _déconnectés"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Comptes"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "Act_ions"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Sommaire"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "É_dition"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "Aid_e"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Préférences"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Quitter"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Envoyer un _message simple..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Affichage"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Merci de patienter pendant la recherche..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Chercher"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Ajouter un contact"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Rechercher"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "Parc_ourir"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "S'enregistrer à"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "De :"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Répondre à ce message"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Envoyer"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Envoyer le message"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Envoyer un message et fermer la fenêtre"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "À :"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Envoyer et Fermer"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_toriser"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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é"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2724,177 +2586,192 @@ msgstr ""
 "Refuser l'autorisation au contact pour qu'il ne puisse pas savoir quand vous "
 "êtes connecté"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Requête d'Inscription"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Refuser"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchroniser : choisissez des contacts"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Désactiver les sons"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Envoyer un _message simple"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Montrer les _événements en attente"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "É_tat"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Salons de discussion"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Requête :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Client :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Heure du contact :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Identifiant Jabber :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressource :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Statut :</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abonnement :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Système :</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Commentaires"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Avatar configuré :"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Contact"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Informations du Contact"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Complément"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Avatar de l'utilisateur :"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Police d'écriture</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafic Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrée XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activer"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Information/Requête"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Message"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Présence"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modifier le compte..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Identifiant local :"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Personnel"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Ressource :"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "État :"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Un client Jabber en GTK+"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Annuler la confirmation"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Le service a envoyé des données mal-formées"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Le service a modifié l'identifiant de la session."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Le service a renvoyé une erreur."
 
@@ -2919,7 +2796,7 @@ msgstr "Entier"
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Couleur"
 
@@ -3056,88 +2933,88 @@ msgstr "Suédois"
 msgid "Chinese (Ch)"
 msgstr "Chinois"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Langue du correcteur orthographique"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Souligné"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Barré"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Police"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Style par défaut"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Êtes vous sûr de vouloir envoyer le fichier ?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "Chiffrement GPG activé"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Absent de la liste"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Ce contact ne prend pas en charge les transferts de fichier."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr "État %(type)s : %(state)s, raison : %(reason)s"
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Aucune clef GPG assignée"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3145,50 +3022,50 @@ msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages avec GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "Chiffrement GPG désactivé"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "La session SERA archivée"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "La session ne sera PAS archivée"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "est"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "N'est PAS"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "sera"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "NE sera PAS"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "et authentifiée"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3197,23 +3074,23 @@ msgstr ""
 "Chiffrement %(type)s %(status)s actif %(authenticated)s.\n"
 "Votre discussion %(logged)s archivée."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Négociation annulée"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Cette session est chiffrée"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " et SERA archivée"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " et NE SERA PAS archivée"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3221,25 +3098,25 @@ msgstr ""
 "Identité du contact non vérifiée. Cliquez sur le bouton bouclier pour plus "
 "de détails."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "Chiffrement E2E désactivé"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Le message suivant n'a PAS été chiffré"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, 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:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3247,15 +3124,15 @@ msgstr ""
 "Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
 "message sera perdu."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Erreur de base de données"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3264,110 +3141,120 @@ 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:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s est maintenant %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "création de la base de donnée de l'historique"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "crée le répertoire %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Modifier les informations du statut"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Modifier le statut"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Choisissez le type de présence et la description"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Disponible pour Discuter"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Connecté"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Longue absence"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Ne pas déranger"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Hors-ligne - Déconnecté(e)"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Description de la présence :"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "L'état a été changé."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Quitter des Groupes de Discussion"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s dans %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Vous n'avez pas joint de groupe de discussion."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Salons de discussion"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Vous avez quitté les groupes de discussion suivants :"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Transférer les messages non-lus"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Tous les messages non-lus ont été transmis."
 
@@ -3466,9 +3353,9 @@ msgstr ""
 "repliés."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "Par défaut"
 
@@ -3770,13 +3657,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:228
+#: ../src/common/config.py:229
 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:229
+#: ../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."
@@ -3784,7 +3671,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:230
+#: ../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."
@@ -3792,7 +3679,7 @@ msgstr ""
 "Si Faux, vous ne verrez plus les lignes d'état dans les conversations quand "
 "un contact modifie son état et/ou son message d'état."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3807,32 +3694,32 @@ msgstr ""
 "affichera seulement « TRUC vient de rejoindre/quitter le groupe de discussion "
 "»."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 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:234
+#: ../src/common/config.py:235
 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:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne pas afficher d'avatars particuliers pour les passerelles."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 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:239
+#: ../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 "
@@ -3842,7 +3729,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:241
+#: ../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 "
@@ -3853,7 +3740,7 @@ msgstr ""
 "l'information sha dans les salons."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3872,36 +3759,36 @@ msgstr ""
 "'pertype' - Toutes les conversations d'un même type (discussion, salon) dans "
 "la même fenêtre."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Cacher les boutons dans les fenêtres de conversations."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Cacher les boutons dans la fenêtre de discussion"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Cache la bannière dans les fenêtres de discussions"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 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:251
+#: ../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."
@@ -3909,15 +3796,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation lors du fusionnement d'un surnom répété."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Défilement doux dans la fenêtre de conversation"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3925,13 +3812,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:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3940,7 +3827,7 @@ msgstr ""
 "métacontacts ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
 "affiché."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3948,7 +3835,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:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3957,7 +3844,7 @@ msgstr ""
 "personnalisé ? Une valeur vide fera en sorte que le dialogue ne soit jamais "
 "affiché."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3968,7 +3855,7 @@ msgstr ""
 "connecté avec une priorité négative, vous ne recevrez AUCUN message en "
 "provenance de votre serveur."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3976,7 +3863,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:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3984,7 +3871,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:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3992,7 +3879,7 @@ msgstr ""
 "Si vrai, Gajim montrera le nombre de contacts connectés et totaux sur les "
 "lignes de groupe et de compte"
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -4000,7 +3887,7 @@ msgstr ""
 "Peut être vide, 'chat' ou 'normal'. Si non vide, traite tous les messages "
 "entrant comme des messages de ce type"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -4008,7 +3895,7 @@ msgstr ""
 "Si Activé, Gajim scrollera et sélectionnera le contact qui vous a envoyé le "
 "dernier message, si la fenêtre de conversation n'est pas déjà ouverte."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -4017,13 +3904,13 @@ msgstr ""
 "image, en utilisant dvips et convert avant de l'insérer dans la fenêtre de "
 "conversation."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Temps d'inactivité nécessaire pour que la fenêtre de changement de statut se "
 "faire."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4031,7 +3918,7 @@ msgstr ""
 "Nombre maximum de lignes affichées dans les conversations. Les lignes les "
 "plus vieilles sont effacées."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4039,12 +3926,12 @@ msgstr ""
 "Si Activé, les fenêtres de notification du notification-daemon seront "
 "attachées à l'icône du Tray."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Choisissez l'intervalle en secondes entre deux vérifications de l'inactivité."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4052,7 +3939,7 @@ msgstr ""
 "Modifiez la valeur pour changer la taille des formules latex affichées. Plus "
 "la valeur est grande, plus la taille l'est."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4060,7 +3947,7 @@ 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:272
+#: ../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!"
@@ -4069,12 +3956,12 @@ msgstr ""
 "connexion à un compte est établie. ATTENTION : cela provoque l'envoie de "
 "nombreuses requêtes !"
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 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:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4083,7 +3970,23 @@ msgstr ""
 "» (toujours), « when_other_resource » (quand d'autres ressources sont "
 "connectées) ou « never » (jamais)"
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4091,7 +3994,7 @@ msgstr ""
 "La priorité va changer automatiquement selon votre état. Les priorités sont "
 "définies dans les options autopriority_*."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4101,41 +4004,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:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Si activé, restaure le dernier statut qui était utilisé."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 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:298
+#: ../src/common/config.py:308
 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:301
+#: ../src/common/config.py:311
 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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Activer le chiffrage ESessions pour ce compte."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 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:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4143,32 +4046,40 @@ 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:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Afficher un message d'avertissement avant d'envoyer un mot de passe via une "
 "connexion non-chiffrée."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 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:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Afficher un message d'avertissement avant d'envoyer un mot de passe via une "
+"connexion non-chiffrée."
+
+#: ../src/common/config.py:320
 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:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Espace envoyée après inactivité"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "ping XMPP envoyé après inactivité"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4177,11 +4088,11 @@ msgstr ""
 "Connexion avant de tenter de se connecter."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Contournement de bug de jabberd2"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4189,15 +4100,15 @@ 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:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Répondre aux demandes d'accusés de réception"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Envoyer des demandes d'accusés de réception"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4205,11 +4116,16 @@ 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:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Remplissez les informations sur le contact à ajouter"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Est-ce que OpenPGP est activé pour ce contact ?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4217,101 +4133,101 @@ msgstr ""
 "Gajim doit-il commencer automatiquement une discussion chiffrée avec ce "
 "contact quand cela est possible ?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Langue dans laquelle faire la vérification orthographique"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "tous ou par état (séparé par des espaces)"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' ou 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ou ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dort"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Travaille"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Je suis sorti profiter de la vie."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Disponible"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Disponible pour discuter"
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Revient de suite."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Non disponible"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Ne pas déranger."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Au revoir !"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4319,60 +4235,52 @@ 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:476
+#: ../src/common/config.py:491
 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:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "vert"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../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:251
-msgid "Wrong host"
-msgstr "Hôte erroné"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Adresse locale invalide ? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, 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:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "L'inscription a réussi"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Enregistrement avec l'agent %s réussi"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "L'inscription a échoué"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4380,39 +4288,39 @@ msgstr ""
 "L'enregistrement avec l'agent %(agent)s a échoué avec l'erreur %(error)s : %"
 "(error_msg)s"
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Erreur d'Écriture du disque"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Invisibilité non-supportée"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Le compte %s ne supporte pas l'invisibilité."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Un message d'un JID invalide a été reçu, il a été ignoré."
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4422,7 +4330,7 @@ msgstr ""
 "(voir http://trac.gajim.org/wiki/DatabaseBackup) ou supprimez le (toutes les "
 "archives seront perdues)."
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Surnom invalide : %s"
@@ -4430,76 +4338,76 @@ msgstr "Surnom invalide : %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Le nombre maximal d'utilisateurs pour %s a été atteint"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Vous êtes banni du salon %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Le salon %s n'existe pas."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Votre pseudonyme enregistré doit être utilisé dans le salon %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Vous n'êtes pas dans la liste des membres du salon %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Le salon de discussion a été détruit"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Vous pouvez rejoindre le salon %s à la place"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4637,17 +4545,17 @@ msgstr "L'utilisation de la clé n'inclut pas la signature d'un certificat"
 msgid "Application verification failure"
 msgstr "Echec de la vérification de l'application"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 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:259
+#: ../src/common/connection.py:274
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4655,11 +4563,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ce message est *chiffré* (Voir : XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4668,81 +4576,81 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Reconnecter manuellement."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Le serveur %(name)s a mal répondu à la requête d'enregistrement : %(error)s"
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, 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:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erreur SSL inconnue : %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Réponse non valide"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "le serveur a répondu : %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "La connexion au proxy a échoué"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossible de se connecter au compte %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, 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:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4751,7 +4659,7 @@ msgstr ""
 "\n"
 "Erreur SSL : <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4760,24 +4668,24 @@ msgstr ""
 "\n"
 "Erreur SSL inconnue : %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 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:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Une erreur s'est produite pendant la suppression de la liste privée"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4786,43 +4694,43 @@ 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Contact envoyé : « %s » (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Contacts envoyés :"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Non récupéré à cause du statut invisible"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "La désinscription a échoué"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, 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:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Observateurs"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Passerelles"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Pas dans la liste"
 
@@ -4832,36 +4740,52 @@ msgstr "Pas dans la liste"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus n'est pas correctement lancé sur cette machine"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (ou python-pysqlite2) n'est pas installé. Quitte..."
+#: ../src/common/dbus_support.py:54
+#, fuzzy
+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"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+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"
+
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "La base de donnée ne peut être lue."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 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:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Le bus de session n'est pas disponible.\n"
+"Essayer en lisant http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Le bus de session n'est pas disponible.\n"
 "Essayer en lisant http://trac.gajim.org/wiki/GajimDBus"
@@ -5029,240 +4953,277 @@ msgstr "Fin de la semaine"
 msgid "Weekend!"
 msgstr "Fin de semaine !"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Caractère non valide dans le nom d'utilisateur."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Adresse du serveur requise."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Caractère non valide dans le nom d'hôte."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Caractère non valide dans la ressource."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "O_ccupé(e)"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Occupé(e)"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Non disponible"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "Dis_ponible pour discuter"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Disponible pour discuter"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Disponible"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Disponible"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Connexion"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Absent(e)"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "Déc_onnecté(e)"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Déconnecté(e)"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Invisible"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "en erreur"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "À"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Les deux"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Aucune"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "S'inscrire"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Aucun"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Modérateurs"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Modérateur"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Visiteurs"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Aucune"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Propriétaire"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrateur"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Membre"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "prête attention à la conversation"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "fait quelque chose d'autre"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 msgid "is composing a message..."
 msgstr "écrit un message..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "a arrêté d'écrire un message"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "a fermé la fenêtre ou l'onglet de discussion"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s Gio"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s Go"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s Mio"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s Mo"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s Kio"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s Ko"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s o"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d message en attente"
 msgstr[1] "%d messages en attente"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " du salon %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr "de l'utilisateur %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr "de %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d évènement en attente"
 msgstr[1] "%d événements en attente"
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Configuration du salon de discussion"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Erreur en exécutant « %(command)s » : %(error)s"
@@ -5272,17 +5233,75 @@ msgstr "Erreur en exécutant « %(command)s » : %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s n'est pas un loglevel valide"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Message par défaut"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+#, fuzzy
+msgid "Audio test"
+msgstr "Audio / Vidéo"
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Taille : %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migration de la base de données de l'historique vers des index"
 
@@ -5919,19 +5938,19 @@ msgstr "Étudie"
 msgid "Writing"
 msgstr "Écrit"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Artiste Inconnu"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Titre Iconnu"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Source Inconnue"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5941,12 +5960,12 @@ msgstr ""
 "de <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5955,7 +5974,7 @@ msgstr ""
 "transfert de fichiers sera annulé."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6026,24 +6045,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erreur en ajoutant le service. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Désactivé"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Message par défaut"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Activé"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Le dictionnaire pour la langue %s est indisponible"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6052,215 +6067,215 @@ 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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "texte du message d'état :"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Reconnecter maintenant ?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Événements non lus"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Lisez tous les événements avant de supprimer ce compte."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Vous avez une conversation ouverte dans le compte %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 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:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Nom de Compte déjà utilisé"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 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:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Renommer le compte"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entrez un nouveau nom pour le compte %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 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:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Aucune clef OpenPGP disponible."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Sélection d'une clé OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Votre serveur ne supporte pas les Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Votre serveur ne peut enregistrer d'informations personnelles."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "Afin de désactiver un compte vous devez être déconnecté."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Ce compte existe déjà localement."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Liste des bannis"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Liste des membres"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Liste des propriétaires"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Liste des administrateurs"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "Identifiant Jabber"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Raison"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Pseudonyme"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Rôle"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Bannissement de ..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6268,11 +6283,11 @@ msgstr ""
 "<b>Qui voulez-vous bannir ?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Ajout d'un Membre ..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6280,11 +6295,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un membre ?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Ajout d'un Propriétaire ..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6292,11 +6307,11 @@ msgstr ""
 "<b>De qui voulez-vous faire un possesseur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Ajout d'un Administrateur ..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6304,7 +6319,7 @@ msgstr ""
 "<b>De qui voulez-vous faire un administrateur ?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6321,86 +6336,114 @@ msgstr ""
 "pseudo@domaine,\n"
 "domaine/ressource, ou les adresses comprenant un sous-domaine)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Émoticônes désactivées"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "La connexion au proxy a échoué"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Que voulez vous faire ?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Supprimer le compte de Gajim _uniquement"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Par défaut"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Tout"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Entrées et sorties seulement"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "Aucun"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Créer un salon de discussion"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-page"
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Caractère non-autorisé"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Serveur invalide"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Salon invalide"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6410,32 +6453,32 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 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:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Saisissez un serveur sur lequel vous voulez vous enregistrer."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Certificat déjà dans un Fichier"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6450,7 +6493,7 @@ msgstr ""
 "Erreur SSL  %(error)s\n"
 "Voulez vous toujours vous connecter au serveur ?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6461,59 +6504,59 @@ msgstr ""
 "Empreinte digitale SHA1 du certificat :\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Premier message reçu"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Message Reçu Suivant Avec le Focus."
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Message Reçu Suivant Sans le Focus"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Contact connecté"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Contact déconnecté"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Message envoyé"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Message d'un salon mis en surbrillance"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Message reçu dans un salon"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Courriel Gmail reçu"
 
@@ -6535,45 +6578,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:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Citation"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, 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:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Ouvrir en tant que _lien"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6581,7 +6624,7 @@ msgstr[0] "Hier"
 msgstr[1] "Hier"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
@@ -6687,73 +6730,73 @@ msgstr "Adresse Yahoo! :"
 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:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Identifiant utilisateur non valide"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "L'identifiant utilisateur ne doit pas contenir de ressource."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Vous ne pouvez pas vous ajouter à votre propre roster."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Contact déjà dans la liste"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Le contact est déjà dans votre liste."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Version de GTK+ :"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Version de PyGTK :"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Développeurs actuels :"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Anciens développeurs :"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "MERCI :"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 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:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6766,106 +6809,106 @@ msgstr ""
 "\n"
 "Le soulignement des fautes d'orthographe ne sera pas utilisé"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Le pseudonyme contient des caractères non autorisés."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Compte invalide"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Identifiant Jabber de salon invalide"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 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:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "L'identifiant jabber du salon de discussion contient des caractères "
 "interdits."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Ceci n'est pas une conversation multi-utilisateurs"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, 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:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Sans connexion, vous ne pouvez pas synchroniser vos contacts."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Ce compte est connecté au serveur"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Synchroniser"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Commencer une discussion"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6874,173 +6917,171 @@ msgstr ""
 "envoyer un message :"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossible d'interpréter \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nouveau message"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Nouveau courrier électronique"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de fichier"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Transfert de fichier interrompu"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Invitation à un salon"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Le contact a changé d'état"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Message simple dans le compte %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "%s Reçu"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Triste"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Modifier"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "Suppri_mer"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7049,152 +7090,152 @@ msgstr ""
 "<b>%s</b> aimerait que vous <b>%s</b> quelques contacts dans votre roster."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Ajouter"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Modifier"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Supprimer"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Identifiant Jabber"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Groupes"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Ajouter un contact"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Enlever le contact de la liste"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste privée <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste privée pour %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordre : %(order)s, action: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifier une règle</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Ajouter une règle</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listes privées pour %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Listes privées"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Nom de liste invalide"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 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:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Vous êtes invité(e) dans un groupe de discussion"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vous a invité dans un salon de discussion"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Voulez-vous accepter l'invitation ?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quand %s devient :"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Ajout de notifications spéciales pour %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "quand je suis "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7205,19 +7246,19 @@ msgstr ""
 "\n"
 "La Short Authentication String cette session est <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Vous avez déjà vérifié l'identité de ce contact."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Identité du contact vérifiée"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Vérifier à nouveau..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7227,19 +7268,19 @@ msgstr ""
 "messages et vous en envoyer, vous devez vérifier son identité en cliquant "
 "sur le bouton en-dessous."
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Identité du contact NON vérifiée"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Vérifier..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Avez-vous vérifié l'identité du contact ?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7254,24 +7295,24 @@ msgstr ""
 "\n"
 "La Short Authentication String de cette session est : <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 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:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Aucune clef GPG n'est assignée à ce contact. Vous ne pouvez donc pas "
 "chiffrer les messages."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7280,7 +7321,7 @@ msgstr ""
 "sa clef</b>, les messages <b>ne peuvent</b> donc <b>pas</b> être chiffrés. "
 "Utilisez votre client GPG pour avoir confiance en cette clef."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7288,19 +7329,19 @@ msgstr ""
 "Une clef GPG est assignée à ce contact, et vous avez confiance en sa clef, "
 "les messages seront donc chiffrés."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr "audio et vidéo"
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr "audio"
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr "vidéo"
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7309,33 +7350,33 @@ msgstr ""
 "%(contact)s veut démarrer un session %(type)s avec vous. Voulez-vous "
 "répondre à son appel ?"
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Autres"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Conférences"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour parcourir les services disponibles"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Gestion des Services du compte %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Le service n'a pu être trouvé"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7343,96 +7384,100 @@ 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:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Le service ne peut pas être parcouru"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Nom de serveur invalide"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Parcourt %(address)s en utilisant le compte %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Parcourir"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Exécuter une commande"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Scanne %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Utilisateurs"
 
 # ccount). Description column
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Marque-pages"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Marque-page déjà spécifié"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, 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:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Marque-page ajouté avec succès"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Inscrit"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Nœud"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Nouvel article"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Désinscrire"
 
@@ -7484,7 +7529,7 @@ msgstr "Nécessite python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Fonctionnalité indisponible sous Windows."
 
@@ -7655,102 +7700,89 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Nécessite python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Bannières et liens cliquables"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-"Possibilité d'avoir des URL cliquables dans les bannières des conversations."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Nécessite python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr "Audio / Vidéo"
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr "Possibilité de démarrer une conversation audio et vidéo."
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr "Nécessite python-farsight."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Fonctionnalité"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Fichier"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Durée"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progression"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Vous"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Destinataire : "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Enregistré dans : %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Ouvrir le répertoire de destination"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "La connexion avec le contact ne peut être établie."
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinataire : %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Message d'erreur : %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Transfert de fichier interrompu"
 
@@ -7758,7 +7790,7 @@ msgstr "Transfert de fichier interrompu"
 msgid "Choose File to Send..."
 msgstr "Choisissez un fichier à envoyer..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Description :"
 
@@ -7790,12 +7822,12 @@ msgstr "Description : %s"
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Impossible de remplacer le fichier existant \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../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."
@@ -7803,22 +7835,22 @@ msgstr ""
 "Un fichier du même nom existe déjà et vous n'avez pas la permission de "
 "l'écraser."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Ce fichier existe déjà"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "What do you want to do?"
 msgstr "Que voulez vous faire ?"
 
 #. read-only bit is used to mark special folder under windows,
 #. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Le dossier \"%s\" n'est pas accessible en écriture"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 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."
 
@@ -7854,73 +7886,57 @@ msgstr "Fichier : "
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Continuer"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim a besoin d'un serveur X pour démarrer. Fermeture..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "l'import de PyGTK a échoué : %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim a besoin de PyGTK 2.12 pour s'exécuter"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr ""
 "Gajim a besoin de PyGTK 2.1é ou supérieur pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim a besoin de GTK 2.12 ou supérieur"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim a besoin de GTK 2.12 ou supérieur pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
-"dernière version stable à partir de %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Vérifiez que GTK+ et PyGTK contiennent le support de glade dans votre "
-"système."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim a besoin de pywin32 pour s'exécuter"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7928,11 +7944,11 @@ msgid ""
 msgstr "Assurez-vous que Pywin32 est installé. Vous pouvez l'obtenir ici : %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim est déjà en cours d'exécution"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7975,8 +7991,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "compte"
 
@@ -7998,12 +8014,15 @@ msgid "status"
 msgstr "état"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "un parmi : offline, online, chat, away, xa, dnd, invisible "
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "message"
 
@@ -8238,70 +8257,89 @@ msgstr ""
 "à tous les comptes"
 
 #: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Modifier le statut"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Picture to use"
+msgstr "Surnom à utiliser"
+
+#: ../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 ""
+"Compte dans lequel le XML sera envoyé ; si non spécifié, le XML sera envoyé "
+"à tous les comptes"
+
+#: ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Gère une URI du type xmpp:"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI à gérer"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr "Compte avec lequel vous voulez le gérer"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Contenu du message"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Joindre un groupe de discussions"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "groupe de discussion"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID du salon"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "pseudonyme"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Surnom à utiliser"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "mot de passe"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Mot de passe pour entrer dans le salon"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Vérifie si Gajim est lancé"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Montre ou cache la fenêtre ipython"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8310,17 +8348,17 @@ msgstr ""
 "'%s' n'est pas dans votre liste de contact.\n"
 "Précisez le compte pour envoyer le message."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Vous n'avez aucun compte actif"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Il semble que Gajim ne soit pas lancé. Vous ne pouvez donc pas utiliser "
 "gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8329,16 +8367,16 @@ msgstr ""
 "Utilisation : %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Arguments :"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s non trouvé"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8347,7 +8385,7 @@ msgstr ""
 "Utilisation : %s commande [arguments]\n"
 "commande est l'une de :\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8356,7 +8394,7 @@ msgstr ""
 "Trop d'arguments.\n"
 "Tapez \"%(basename)s help %(command)s\" pour plus d'informations"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8365,7 +8403,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:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Mauvaise adresse (URI)"
 
@@ -8395,175 +8437,176 @@ msgid "Please first choose another for your current theme."
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "L'envoi du message privé a échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Insérer un surnom"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Conversation avec "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Conversation continuée"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 "N'importe quel occupant est autorisé à voir votre identifiant Jabber complet"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "L'enregistrement des conversations du salon est activé"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Un nouveau salon a été créé"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "Changement d'affiliation"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "La configuration du salon a changé pour « membres seulement »"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "Extinction du système"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s a rejoint le salon de discussion"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 est maintenant %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Ne plus me poser la question"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Changement de Sujet"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Saisissez le nouveau sujet :"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Changement de Surnom"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Destruction de %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8571,22 +8614,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:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Vous pouvez également entrer une juridiction alternative :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -8607,61 +8650,61 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Rapporter l'anomalie"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Détails"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim n'est pas le client Jabber par défaut"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 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:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Extension non supportée"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Enregistrer l'image sous..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8672,58 +8715,58 @@ msgstr ""
 "utilisé ou enregistré par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Toujours utiliser ce pseudo en cas de conflit"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acceptez vous cette requête sur le compte %s ?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorisation HTTP (%(method)s) pour %(url)s (id : %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "La connexion a échoué"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Erreur %(code)s : %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erreur en envoyant %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Requête d'Inscription"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, 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:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8731,61 +8774,61 @@ msgstr ""
 "Vous le/la verrez toujours hors-ligne.\n"
 "Voulez vous le/la supprimer de votre liste de contacts ?"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Désinscrit(e)"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s a changé le sujet en %(subject)s"
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Le salon affiche dorénavant les membres non-disponibles"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "Le salon n'affiche plus les membres non-disponibles"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Un changement de la configuration du salon relatif à la vie-privée a eu lieu"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "L'enregistrement des conversations du salon est maintenant activé"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "L'enregistrement des conversations du salon est maintenant désactivé"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Le salon n'est plus anonyme"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Le salon est maintenant sami-anonyme"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Le salon est maintenant totalement anonyme"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
@@ -8793,23 +8836,23 @@ msgstr ""
 "Vous avez configuré Gajim pour qu'il utilise un agent GPG, mais aucun agent "
 "GPG n'est lancé ou il a renvoyé un mauvais mot de passe.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Mot de passe OpenGPG est incorrect"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "la clef GPG n'est pas une clef de confiance"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8817,27 +8860,28 @@ 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:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 "Gnome Keyring est installé mais pas \t\t\t\tcorrectement démarré (variable "
 "d'environnement probablement \t\t\t\tmal configurée)"
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nouveau courriel sur %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8852,43 +8896,43 @@ msgstr ""
 "Sujet : %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Le contact distant à stoppé le transfert"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Erreur à l'ouverture du fichier"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8897,36 +8941,36 @@ msgstr ""
 "Impossible de déchiffrer le message de %s\n"
 "Il a peut-être été manipulé."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Impossible de déchiffrer le message"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Conflit de nom d'utilisateur"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Veuillez entrer un nouveau surnom pour votre compte local"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping ?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong ! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Erreur."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Conflit de ressource"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8934,20 +8978,21 @@ msgstr ""
 "Vous êtes déjà connecté à ce compte avec la même ressource. Veuillez en "
 "entrer une nouvelle"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 msgid "Voice Chat Request"
 msgstr "Requête de transfert de fichier"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Erreur durant la vérification du certificat SSL"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8958,15 +9003,15 @@ msgstr ""
 "serveur Jabber : %(error)s\n"
 "Voulez-vous toujours vous connecter à ce serveur ?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer cette erreur pour ce certificat."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Erreur de certificat SSL"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8984,23 +9029,28 @@ msgstr ""
 "Voulez vous toujours vous connecter et mettre à jour l'empreinte digitale du "
 "certificat ?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Connexion non-sécurisée"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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 ""
 "Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
-"chiffrée. Êtes vous sûr de vouloir le faire ?"
+"sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
+"sûr de vouloir le faire ?"
 
-#: ../src/gui_interface.py:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 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:1972
+#: ../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?"
@@ -9009,21 +9059,30 @@ msgstr ""
 "sécurisée. Vous devriez installer PyOpenSSL pour empêcher cela. Êtes-vous "
 "sûr de vouloir le faire ?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Vous êtes sur le point d'envoyer votre mot de passe sur une connexion non-"
+"chiffrée. Êtes vous sûr de vouloir le faire ?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "Le nœud PEP n'a pas été supprimé"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Le nœud PEP %(node)s n'a pas été supprimé : %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Émoticônes désactivées"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9031,7 +9090,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:2570
+#: ../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 "
@@ -9041,7 +9100,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:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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 "
@@ -9049,35 +9108,35 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gui_interface.py:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Impossible d'enregistrer vos informations de configuration"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Entrez votre mot de passe GPG pour la clé %(keyid)s (compte %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "Clef GPG expirée"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Votre clef GPG a expiré, vous serez connecté(e) à %s sans OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Mot de passe erroné"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
 
@@ -9085,37 +9144,37 @@ msgstr "Ressaisissez votre mot de passe GPG ou appuyez sur Annuler."
 msgid "_New Group Chat"
 msgstr "_Nouveau Salon de Discussion"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Impossible de trouver la base de données de l'historique"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Contacts"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Date"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Pseudonyme"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Message"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9123,7 +9182,7 @@ msgstr ""
 "Voulez vous nettoyer la base de donnée ? (TRÈS DÉCONSEILLÉ SI GAJIM EST "
 "LANCÉ)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9137,26 +9196,26 @@ msgstr ""
 "\n"
 "Si vous choisissez OUI, patientez..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Exportation de l'historique..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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] "Voulez vous réellement supprimer l'historique de ce contact ?"
 msgstr[1] "Voulez vous réellement supprimer l'historique de ces contacts ?"
 
-#: ../src/history_manager.py:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Ceci est une opération irréversible."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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é ?"
@@ -9195,35 +9254,35 @@ msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Délai du chargement de l'image dépassé"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Discussions"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Salons de discussion"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Conversations privées"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Messages"
 
@@ -9235,22 +9294,22 @@ msgstr "- les messages seront archivés"
 msgid "- messages will not be logged"
 msgstr "- les messages ne seront pas archivés"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s a changé d'état"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s s'est connecté(e)"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s s'est déconnecté(e)"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nouveau message simple de %(nickname)s"
@@ -9275,7 +9334,7 @@ msgstr "Message de %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nouveau message de %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -9283,18 +9342,18 @@ msgstr "Ignorer"
 msgid "Retrieving profile..."
 msgstr "Récupération du profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Le fichier est vide"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Le fichier n'existe pas"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Impossible de charger l'image"
 
@@ -9326,51 +9385,51 @@ msgstr ""
 "Une erreur s'est produite lors de la publication de vos informations "
 "personnelles, veuillez réessayer plus tard."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, 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:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG n'est pas utilisable"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vous serez connecté à %s sans OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9378,27 +9437,38 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "désynchronisé"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Vraiment quitter Gajim ?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Êtes-vous sûr de vouloir quitter Gajim ?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Toujours fermer Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Annule le transfert de fichier"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Vous avez des messages non lus"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9406,16 +9476,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:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Vous devez les lire avant de supprimer ce compte."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9423,11 +9493,11 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages des contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Les passerelles seront enlevées"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9436,13 +9506,13 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de ces "
 "passerelles : %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 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:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9451,58 +9521,58 @@ msgstr ""
 "vous enverra."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Renommer le contact"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entrez un nouveau surnom pour le contact %s."
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "_Renommer le Groupe"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entrez un nouveau nom pour le groupe %s."
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "_Supprimer le Groupe"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez la clé correspondant au contact"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, 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:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9511,11 +9581,11 @@ msgstr ""
 "verra donc toujours déconnecté(e)."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Voulez vous continuer ?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9523,16 +9593,16 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il/Elle "
 "vous verra donc toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Les contacts seront enlevés de la liste de contacts"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9542,36 +9612,37 @@ msgstr ""
 "vous enlevez aussi leurs autorisations. Ces contacts vous verront donc "
 "toujours déconnecté(e)."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 "Ce contact vous vera %(status)s, mais seulement jusqu'à ce que vous changiez "
 "votre statut. Il verra alors votre statut global."
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 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:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9580,14 +9651,14 @@ msgstr ""
 "métacontacts. Par conséquent, ces informations ne seront pas enregistrées "
 "lors de la prochaine connexion."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9597,23 +9668,23 @@ msgstr ""
 "Généralement, cela est utile lorsqu'une même personne possède plusieurs "
 "comptes Jabber ou des comptes de transport."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Url de fichier invalide :"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Envoyer %s à %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Faire de %s et %s des métacontacts"
@@ -9623,126 +9694,130 @@ msgstr "Faire de %s et %s des métacontacts"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "du compte %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Gérer les marque-pages..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "du compte %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Publier ce que j'écoute"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Publier ce que j'écoute"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Configurer les Services..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "Tout _maximiser"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "_Envoyer un message de groupe"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "À tous les utilisateurs"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "À tous les utilisateurs connectés"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Gérer les Contacts"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Envoyer un message Simple"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Gérer les Passerelles"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Modifier la Passerelle"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maximiser"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Reconnecter"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Déconnecter"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Gestionnaire d'historique"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Joindre un salon de discussion"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
@@ -9773,13 +9848,13 @@ msgid "Confirm these session options"
 msgstr "Confirmer ces options de session"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Le client distant veut négocier une session avec ces fonctionnalités :\n"
 "\n"
@@ -9802,116 +9877,126 @@ msgstr ""
 "\n"
 "Continuer la session ?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "dans le _roster"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Identifiant Jabber :"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Ressource : "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [bloqué]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimisé]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "État : "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Dernier état : %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " depuis %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Déconnecté(e)"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Inscription : "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Ton :"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Notification"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Type : "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Non commencé"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?transfer status:En pause"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Calé"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 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:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9919,35 +10004,35 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Date:Inconnue"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "depuis %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Affiliation :</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 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:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9955,12 +10040,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "vôtre"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9968,19 +10053,381 @@ 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:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Il n'y a aucune requête d'inscription en attente."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "_Rejoindre un _salon de discussion..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Ajouter un contact..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Découvrir les services"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Exécuter une commande..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Modifier le compte"
+
+#~ msgid "_Personal Events"
+#~ msgstr "Évènements P_ersonnels"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "Commencer une _discussion..."
+
+#~ msgid "_Status"
+#~ msgstr "É_tat"
+
+#~ msgid "Account Modification"
+#~ msgstr "Modification du compte"
+
+#~ 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 ""
+#~ "Si vous cochez cette case, Gajim se connectera sur le port 5223, sur "
+#~ "lequel les serveurs sont supposés gérer le SSL. Notez que Gajim utilise "
+#~ "le chiffrement TLS par défaut si le serveur annonce qu'il le supporte, et "
+#~ "avec cette option vous désactivez le TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "_Éditer les informations personnelles..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Serveur :"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Si cette case est cochée, Gajim va stocker le mot de passe dans ~/.gajim/"
+#~ "config avec accès en lecture pour vous uniquement"
+
+#~ msgid "Port: "
+#~ msgstr "Port : "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy :"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Enregistrer votre mot de _passe (non sécurisé)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Envoi des paquets de maintien de connexion"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Utiliser _SSL"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Ajuster selon l'état"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Supprimer MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Envoyer un message au serveur..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Réception d'un message\n"
+#~ "Contact déconnecté \n"
+#~ "Changement de l'état du contact \n"
+#~ "Surbrillance des messages dans les salons \n"
+#~ "Réception d'un message dans un salon \n"
+#~ "Demande de transfert de fichier \n"
+#~ "Transfert de fichier lancé \n"
+#~ "Transfert de fichier complété"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "contact(s)\n"
+#~ "groupe(s)\n"
+#~ "tous"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Rejoindre un _salon de discussion"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Copier l'identifiant Jabber / l'adresse électronique"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Copier l'adresse du lien"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Ouvrir le logiciel de courriel"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Ouvrir le lien dans votre navigateur"
+
+#~ msgid "_Start Chat"
+#~ msgstr "Commencer une _discussion"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Compte\n"
+#~ "Groupe\n"
+#~ "Contact\n"
+#~ "Bannière"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Changer de Sur_nom..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Changer le _Sujet..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Configurer le _Salon..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Détruire le Salon"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Gérer le Salon"
+
+#~ msgid "Send _File"
+#~ msgstr "Envoyer un _fichier"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Ajouter à la liste de contacts"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Envoyer un message privé"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Entrez un identifiant Jabber ou un nom\n"
+#~ "Historiques de conversations groupées\n"
+#~ "Tous les Historiques"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Gérer les comptes"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Ajouter le contact à la liste de contacts (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Enregistrer ce salon dans les marque-pages (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Parcourir l'historique des conversations (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Changer le sujet du salon (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Changer votre surnom (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Inviter des contacts dans la conversation (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Envoyer un fichier (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Afficher une liste des émoticônes (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Afficher une liste de styles"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Affiche un menu de fonctions avancées (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Afficher le profil du contact (Ctrl+I)"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Démarrer/arrêter une session audio"
+
+#~ msgid "Toggle video session"
+#~ msgstr "Démarrer/arrêter une session vidéo"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Tous les états\n"
+#~ "En train de composer seulement\n"
+#~ "Aucun"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Détection automatique à chaque démarrage\n"
+#~ "Toujours utiliser les applications par défaut de GNOME\n"
+#~ "Toujours utiliser les applications par défaut de KDE\n"
+#~ "Toujours utiliser les applications par défaut de Xfce\n"
+#~ "Personnalisé"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Conversations séparées et Roster séparé\n"
+#~ "Fenêtre de conversation unique, Roster séparé\n"
+#~ "Fenêtre unique pour tout\n"
+#~ "Conversations par compte et Roster séparé\n"
+#~ "Conversations par type et Roster séparé"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "L'afficher dans un popup\n"
+#~ "Afficher une notification\n"
+#~ "Afficher uniquement dans le Roster"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "aucun\n"
+#~ "les deux\n"
+#~ "De\n"
+#~ "À"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "_Ajouter un contact..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Fonc_tionnalités"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Transfert de fichiers"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil et _avatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Comptes"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sommaire"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Préférences"
+
+#~ msgid "_Quit"
+#~ msgstr "_Quitter"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Envoyer un _message simple..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Envoyer un _message simple"
+
+#~ msgid "Sta_tus"
+#~ msgstr "É_tat"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Salons de discussion"
+
+#~ msgid "Enable"
+#~ msgstr "Activer"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modifier le compte..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Hôte erroné"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Adresse locale invalide ? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (ou python-pysqlite2) n'est pas installé. Quitte..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Bannières et liens cliquables"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Possibilité d'avoir des URL cliquables dans les bannières des "
+#~ "conversations."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Nécessite python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
+#~ "dernière version stable à partir de %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Vérifiez que GTK+ et PyGTK contiennent le support de glade dans votre "
+#~ "système."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "Message _entrant :"
 
@@ -10197,12 +10644,6 @@ msgstr " ressource avec la priorité "
 #~ msgid "Gajim account %s"
 #~ msgstr "Compte Gajim %s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Toujours utiliser les applications OS/X par défaut."
-
-#~ msgid "Custom"
-#~ msgstr "Personnalisé"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Identifiant Jabber dupliqué"
 
diff --git a/po/gl.po b/po/gl.po
index 0db4cc0eb..358ffd85f 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: es\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-06 22:12+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -20,63 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un cliente de Jabber de GTK"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
-msgid "Join _Group Chat..."
-msgstr "Entrar nun grupo de charla"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Engadir un contacto..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Descubrir os servizos"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "Executar o _comando..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Modificar conta"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir a caixa de entrada de GMail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Información persoal"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Iniciar a charla"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "E_stado"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -87,83 +35,90 @@ msgstr ""
 "\n"
 "Por favor, agarde..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor, elixa unha das opcións seguintes:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, 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/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Usar a autenticación"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Conectar cando prema Rematar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: asistente para crear unha conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Xa teño unha conta e quero empregala"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Quero _rexistrar unha conta nova de Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Se isto está marcado, o Gajim lembrará o contrasinal para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Xestionar..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ningún"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "_Gardar o contrasinal"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Configurar o meu perfil ao me conectar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Usa un nome de host e un porto personalizados"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -171,150 +126,146 @@ msgstr ""
 "Precisa unha conta para se conectar\n"
 "á rede Jabber"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Rematar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Nome do host:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "C_ontrasinal:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Varios</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Información persoal</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Propiedades</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Adaptar ao estado"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Conta"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Modificar a conta"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Contas"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "Listaxe de administradores"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Usar a autenticación"
+
+#: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Conectar automaticamente se se perde a conexión"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar ao inicio de Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Cam_biar o contrasinal"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Ao marcar esta opción, o Gajim conectará o porto 5223 cando un servidor "
-"antigo use SSL. Cómpre ter en conta que o Gajim usa un cifrado TLS por "
-"defecto se está dispoñíbel no servidor e que con esta opción se desactiva o "
-"TLS"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Elixir a _chave..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Prema para cambiar o contrasinal da conta"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onectar ao inicio de Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "_Editar a información persoal..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Correo electrónico:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Nome:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1156
-#: ../src/common/helpers.py:1168 ../src/notify.py:553 ../src/notify.py:574
-#: ../src/notify.py:612 ../src/notify.py:624
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:59 ../src/common/contacts.py:140
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2747
-#: ../src/roster_window.py:5259
+#: ../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 "Xeral"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Nome do host:"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -322,8 +273,12 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, 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:26
 #, fuzzy
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
@@ -332,16 +287,7 @@ msgstr ""
 "Se isto está marcado, o Gajim enviará paquetes de mantemento de actividade "
 "para previr que expire a conexión"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Se isto está marcado, o Gajim gardará o contrasinal en ~/.gajim/config para "
-"o que unicamente vostede terá acceso de só lectura"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -349,8 +295,7 @@ msgstr ""
 "Se isto está marcado, o Gajim, ao se iniciar, conectarase automaticamente a "
 "Jabber con esta conta."
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -360,47 +305,49 @@ msgstr ""
 "de combinación da parte inferior da listaxe de contactos) cambiará o estado "
 "desta conta en consecuencia"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "A súa información, para se gardar no servidor"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1702
-#: ../src/config.py:2252
+#: ../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 "ID de Jabber:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Apelido(s):"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Combinar as contas"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Non se seleccionou ningunha chave"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1215
-#: ../src/config.py:1318 ../src/config.py:1606 ../src/config.py:1611
-#: ../src/config.py:2159 ../src/config.py:2238 ../src/config.py:2251
-#: ../src/config.py:3452 ../src/config.py:3525 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2801 ../src/roster_window.py:2807
-#: ../src/roster_window.py:2812
-msgid "None"
-msgstr "Ningún"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Información persoal"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Porto: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Pr_ioridade:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -410,23 +357,21 @@ msgstr ""
 "servidor cando dous ou máis clientes están conectados e usan a mesma conta. "
 "O cliente con maior prioridade recibe os acontecementos."
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "A prioridade mudará automaticamente segundo o seu estado."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Re_nomear"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "Re_curso: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -441,213 +386,99 @@ msgstr ""
 "recurso que teña a prioridade máis alta será o que reciba os eventos (mire "
 "máis abaixo)."
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Gardar o contrasinal (inseguro)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Gravar as conversas para todos os contactos"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Enviar paquetes de mantemento de actividade"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar o estado da conta co estado global"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Amosar os contactos desconectados"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Usar _SSL (o antigo)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Usar proxies para as transferencias de ficheiros"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Adaptar ao estado"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-#, fuzzy
-msgid "_Name:"
-msgstr "_Nome: "
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Propiedades</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "_Adaptar ao estado"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Contas"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Usar a autenticación"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "C_onectar ao inicio de Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Correo electrónico:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Nome:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, 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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1729
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "ID de Jabber:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Apelido(s):"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Combinar as contas"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5214
-msgid "Re_name"
-msgstr "Re_nomear"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Enviar paquetes de mantemento de actividade"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Sinc_ronizar o estado da conta co estado global"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Amosar os contactos desconectados"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Usa un nome de host e un porto personalizados"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Usar o porto personalizado:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Usar proxies para as transferencias de ficheiros"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "_Editar a información persoal..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Activar"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Nome do host:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Xestionar..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Porto:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Conta:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Engadir un contacto novo"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../data/gui/add_new_contact_window.ui.h:5
 #, fuzzy
 msgid ""
 "You have to register with this transport\n"
@@ -660,7 +491,7 @@ msgstr ""
 "protocolo. Prema o botón Rexistrar\n"
 "para continuar."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -668,632 +499,684 @@ msgstr ""
 "Debe estar conectado ao transporte para poder\n"
 "engadir un contacto deste protocolo."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Alcume:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protocolo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Rexistrar"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 #, fuzzy
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Produciuse un erro:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Elixa o comando para executar:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Comandos ad-hoc - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Comprobar mais unha vez"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Descrición do erro..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Por favor, agarde mentres se envía o comando..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Por favor, agarde..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Esta entidade de jabber non expón comandos."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Descrición</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 #, 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Editor avanzado de configuración"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Eliminar MDD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Elimina a mensaxe do día (MDD)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Listaxes de _privacidade"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Envíalles unha mensaxe aos usuarios conectados neste momento ao servidor"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Definir a MDD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Define a mensaxe do día"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Amosar a consola de _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Actualizar a MDD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Actualiza a mensaxe do día"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "_Enviar a mensaxe do servidor"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Accións</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Condicións</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Accións A_vanzadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Control de notificacións avanzadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Todos os estados"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:231
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Ausente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Ocupado "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:241
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Invisíbel"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Enviar un comando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:214
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Non dispoñíbel"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Un ou máis estados especiais..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "En liña / Libre para falar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Reproducir un _son"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Recibir unha mensaxe\n"
-"O contacto está conectado \n"
-"O contacto está desconectado \n"
-"O contacto mudou de estado \n"
-"Mensaxe de grupo de charla realzado \n"
-"Mensaxe de grupo de charla recibida \n"
-"Solicitude de transferencia \n"
-"Transferencia iniciada \n"
-"Transferencia rematada"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../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/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Desactivar as fiestras emerxentes existentes"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Desactivar os sons existentes para este acontecemento"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Desactivar mostrar os eventos no roster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Desactivar mostrar os eventos na área de notificación"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informarme cunha fiestra emerxente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Abrir unha fiestra de charla con este usuario"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Mostrar o evento na listaxe de contactos"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Mostrar o evento na área de notificación"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "e eu "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"contacto(s)\n"
-"grupo(s)\n"
-"todo o mundo"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "para "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entrada:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Nome do feed:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Última modificación:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Recibiuse unha entrada nova"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Recibiu unha entrada nova:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "Contactos"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Cambiar o contrasinal"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Insírao mais unha vez para confirmar:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Insira o contrasinal novo:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Activo"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Sala:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Mensaxes predefinidas:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Gardar como predefinido..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Entrar nun grupo de charla"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "núm."
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Engadir á listaxe de contactos"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Copiar o enderezo"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Copiar o enderezo da ligazón"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Abrir o editor de correo"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Abrir a ligazón no navegador"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Iniciar a charla"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Enviar"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "Con_vidar"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "Observadores"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "Pregunta para ver o _seu estado"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "Engadir unha _notificación especial"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "Asignar chave de OpenPGP"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Executar o comando..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Editar os grupos"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5169
-#: ../src/roster_window.py:5324
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "Con_vidar"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Contactos"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Eliminar"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5179
-#: ../src/roster_window.py:5411
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Envía XML personalizado"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Enviar unha _mensaxe..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "Enviar ficheiro"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Iniciar a charla"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Alternar a codificación OpenPGP"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Alternar a codificación OpenPGP"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Engadir á listaxe de contactos"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "Permitirlle ver o meu estado"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5238
-#: ../src/roster_window.py:5361 ../src/roster_window.py:5488
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "Prohibirlle ver o meu estado"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5557
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historial"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "Renomear o contacto"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "Renomear"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Subscrición"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5232
-#: ../src/roster_window.py:5355 ../src/roster_window.py:5485
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "nove"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Cubrir o formulario."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configuración da sala"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Editar grupos"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Descrición</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Características dos servidores"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Cancelar a transferencia"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Cancela a transferencia seleccionada do ficheiro"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Limpar"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Transferencias"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Oculta a fiestra"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias da listaxe"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1301,76 +1184,75 @@ msgstr ""
 "Esta acción elimina transferencias da listaxe. Se a transferencia estiver "
 "activa, detense primeiro e elimínase despois"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr ""
 "Cando unha transferencia se completar, amosa unha notificación emerxente"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Continuar"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificarme cando rematar unha transferencia"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Abrir un cartafol de contido"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "listaxe de transferencias"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../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/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Conta\n"
-"Grupo\n"
-"Contacto\n"
-"Báner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Conta"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Negra"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../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"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Contacto"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Estilo:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Personalización de temas do Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Marchei"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inactivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Itálica"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1378,7 +1260,7 @@ msgstr ""
 "MUC\n"
 "Mensaxes"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1386,115 +1268,74 @@ msgstr ""
 "Mensaxes dirixidas\n"
 "ás salas"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pausado"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Cor do texto:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Letra do texto:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Fondo"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "Cambiar o _alcume"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "Cambiar o _tema"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "Configurar a sala"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1745
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Engadir esta sala aos marcadores"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Xestionar os marcadores"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Accións"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Enviar ficheiro"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Engadir á listaxe de contactos"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Deshabilitar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Propietario"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Enviar unha mensaxe privada"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Crear unha publicación nova"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:256
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:188
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
 #: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1511,26 +1352,20 @@ msgstr ""
 "con que estiver\n"
 "a falar neste momento."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../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/glade/history_manager.glade.h:4 ../src/dialogs.py:3005
-#: ../src/dialogs.py:3102
-msgid "Delete"
-msgstr "Eliminar"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Exportar"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Xestor do Historial de Gajim"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1539,514 +1374,439 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Buscar na base de datos"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Nome de contacto"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Grupos de charla"
+
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Buscar"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "Historial de conversas"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "Engadir esta sala aos marcadores"
+msgid "Bro_wse Rooms"
+msgstr "_Navegar"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2075
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Entrar nunha sala de charlas"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/gui/join_groupchat_window.ui.h:4
 #, fuzzy
-msgid "Join this room automatically when I connect"
+msgid "Join this room _automatically when I connect"
 msgstr "Configurar o meu perfil ao me conectar"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Alcume:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Contrasinal: "
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1305
-#: ../src/disco.py:1749
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Engadir esta sala aos marcadores"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Xestionar as contas"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Autoconectar"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Xestionar os marcadores"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Amosar o estado:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1719
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Título:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Configuración da sala"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Continuar"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "Eliminar"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Propiedades</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Configuración</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr "Conectar con HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Xestionar os perfís do proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Contrasinal: "
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Porto:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Usar a autenticación"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "_URL"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+#, fuzzy
+msgid "_Name:"
+msgstr "_Nome: "
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Nome de usuario:"
 
-#. # means number
-#: ../data/glade/message_window.glade.h:1 ../src/dialogs.py:3937
-msgid "#"
-msgstr "núm."
-
-#: ../data/glade/message_window.glade.h:2
-msgid "*"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:3
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "1"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-msgid "2"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:6
-msgid "3"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:7
-msgid "4"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-msgid "5"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:9
-msgid "6"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:10
-msgid "7"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:11
-msgid "8"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "9"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Engade o contacto á listaxe"
-
-#: ../data/glade/message_window.glade.h:14
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Engadir esta sala aos marcadores"
-
-#: ../data/glade/message_window.glade.h:15
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:16
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:17
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Cambiar o _alcume"
-
-#: ../data/glade/message_window.glade.h:18
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "está a prestar atención á conversa"
-
-#: ../data/glade/message_window.glade.h:19
-msgid "Mic volume:"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:20
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:21
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:22
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:23
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:24
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:25
-msgid "Sound volume:"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:26
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:27
-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/glade/message_window.glade.h:29
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Enviar"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Contrasinal"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor de configuración avanzada</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Programas</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
 msgid "<b>Audio</b>"
 msgstr "<b>Accións</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Accións</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../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>"
 
-#: ../data/glade/preferences_window.glade.h:7
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notificacións visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
 msgid "<b>Connection</b>"
 msgstr "<b>Condicións</b>"
 
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opcións de GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<i>Listaxe de privacidade</i>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Mensaxes de estado predefinidas</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Propiedades</b>"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:20
 #, fuzzy
 msgid "<b>Video</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificacións visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/gui/preferences_window.ui.h:22
 msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Avanzado"
 
-#: ../data/glade/preferences_window.glade.h:25
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Todos os estados da charla\n"
-"Só escribindo\n"
-"Desactivado"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Todos os estados"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../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"
+
+#: ../data/gui/preferences_window.ui.h:28
 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/glade/preferences_window.glade.h:30
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Ausente"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Preguntar a mensaxe de estado cando estea: "
 
-#: ../data/glade/preferences_window.glade.h:32 ../src/features_window.py:108
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
 msgid "Audio / Video"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:38
 #, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
-msgstr ""
-"Detectar automaticamente en cada inicio do Gajim\n"
-"Usar sempre as aplicacións por defecto do GNOME\n"
-"Usar sempre as aplicacións por defecto do KDE\n"
-"Usar sempre as aplicacións por defecto do Xfce\n"
-"Personalizado"
+msgid "Autodetect on every Gajim startup"
+msgstr "C_onectar ao inicio de Gajim"
 
-#: ../data/glade/preferences_window.glade.h:40
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "A compor"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Configurar as cores e as fontes da interface"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nome de contacto"
 
-#: ../data/glade/preferences_window.glade.h:45
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personalizado</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Desactivado"
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Amosar os detalles _extra nos correos electrónicos"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Amosar na listaxe os a_vatares dos contactos"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Amosar na listaxe os a_vatares dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Amosar na listaxe as _mensaxes de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../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 "
@@ -2056,7 +1816,7 @@ msgstr ""
 "estiver a manter cun contacto. Pode especificar aquí que estados de charla "
 "quere que se amosen nas fiestras."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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 "
@@ -2066,7 +1826,7 @@ msgstr ""
 "estiver a manter cun contacto. Pode especificar aquí que estados de charla "
 "quere enviarlle á outra persoa."
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../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"
@@ -2074,19 +1834,19 @@ msgstr ""
 "O Gajim notificaralle cunha mensaxe emerxente na parte inferior dereita da "
 "pantalla cando un contacto se desconectar"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se isto está marcado, o Gajim entrará a esta sala ao inicio"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -2094,18 +1854,18 @@ msgstr ""
 "Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
 "de correos electrónicos novos"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2113,7 +1873,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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"
@@ -2121,7 +1881,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as mensaxes de estado dos contactos "
 "debaixo do nome do contacto na listaxe e en grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2129,7 +1889,15 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../data/gui/preferences_window.ui.h:70
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2137,7 +1905,7 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2145,14 +1913,14 @@ msgstr ""
 "Se isto está marcado, o Gajim amosará as circunstancias dos contactos na "
 "listaxe e nos grupos de charla"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../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/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2163,14 +1931,14 @@ msgstr ""
 "Emprégueo con precaución xa que bloqueará todas as mensaxes de calquera "
 "contacto que non estiver na súa listaxe de contactos."
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../data/gui/preferences_window.ui.h:76
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2179,7 +1947,7 @@ msgstr ""
 "Se isto está marcado, o Gajim tamén incluirá información sobre o remitente "
 "de correos electrónicos novos"
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../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, "
@@ -2189,13 +1957,13 @@ msgstr ""
 "(por exemplo, un contacto de MSN terá a icona de MSN equivalente para o seu "
 "estado en liña, ausente, ocupado etc.)"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2203,84 +1971,104 @@ msgstr ""
 "Se non está desactivado, o Gajim substituirá emoticonas ASCCI ':)' polo seu "
 "equivalente en iconas gráficas estáticas ou animadas"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Unha soa fiestra de conversa"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Xestio_nar..."
 
-#: ../data/glade/preferences_window.glade.h:80
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:83
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificar a conta"
 
-#: ../data/glade/preferences_window.glade.h:84
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar cando un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar cando un contacto: "
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notificarmo"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Notificar de novos correos de _GMail"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Información persoal"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Reproducir _sons"
 
-#: ../data/glade/preferences_window.glade.h:89
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Emerxer"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
 #, fuzzy
 msgid "STUN server:"
 msgstr "Servidor:"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Amosar só na _listaxe de contactos"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Mostrar o evento na área de notificación"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:97
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2288,30 +2076,30 @@ msgstr ""
 "Algunhas mensaxes poden incluír un contido adornado (formato, cores etc). Se "
 "isto está marcado, o Gajim amosará a mensaxe en bruto."
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar os contacto_s polo estado"
 
-#: ../data/glade/preferences_window.glade.h:99 ../src/config.py:384
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Conxunto de _iconas de estado por defecto:"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "Atascado"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "Te_ma:"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2319,7 +2107,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../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"
@@ -2327,607 +2115,564 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "_Usar as iconas do transporte"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Usar o pre_definido do sistema"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video input device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:117
 msgid "Video output device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Cando se reciba un acontecemento novo"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Mensaxe de erro: %s"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Ant_es do alcume:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "Pór _ausente despois de:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Notificacións de estado nas charlas:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticonas:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "A_dministrador de ficheiros:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Marcar os erros ortográficos"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 "_Ignorar as mensaxes de contactos que non estean na listaxe de contactos"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:128
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignorar o contido adornado en mensaxes entrantes"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Rexistrar os cambios de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../data/glade/preferences_window.glade.h:126
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Pór _non dispoñíbel despois de:"
 
-#: ../data/glade/preferences_window.glade.h:127
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:128
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Restabelecer as cores predeterminadas"
 
-#: ../data/glade/preferences_window.glade.h:129
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Notificacións de estado nas charlas:"
 
-#: ../data/glade/preferences_window.glade.h:130
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "Men_saxe de estado:"
 
-#: ../data/glade/preferences_window.glade.h:131
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:132
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:133
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entrar nun grupo de charla"
 
-#: ../data/glade/preferences_window.glade.h:134
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "Non está na listaxe"
 
-#: ../data/glade/preferences_window.glade.h:135
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutos"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Listaxes de privacidade:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Engadir / Editar unha regra</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Listaxe de regras</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Listaxe de privacidade</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Activo para esta sesión"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Activo en cada inicio"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Todos"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "todos por subscrición"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "ID de Jabber:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Orde:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3233
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Listaxe de privacidade"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "todos por subscrición"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "todos no grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ningún\n"
-"ambos\n"
-"de\n"
-"a"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Ambos"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "De"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "unha"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "dúas"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "para me enviar mensaxes"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "para me enviar preguntas"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "para me enviar o estado"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "para ver o meu estado"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "Imaxe:"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Birthday:</b>"
 msgstr "Aniversario:"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../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/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Departamento:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "Correo electrónico:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Segundo enderezo:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familia:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Personalizado</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Páxina web:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Alcume:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Teléfono:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Condicións</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Propiedades</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:331
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Configuración</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../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>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sons</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Acerca de"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Prema para definir a súa circunstancia"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Información persoal"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Traballo"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Que quere facer?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Eliminar a _conta unicamente do Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Eliminar a conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5371 ../src/roster_window.py:5498
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Eliminar"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Engadir un contacto..."
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Características dos servidores"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Transferencias"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Preguntas frecuentes (en liña)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Axuda en liña"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Perfil, Ima_xe"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Amosar os trans_portes"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Amosar os contactos desconectados"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Amosar _listaxe"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Contas"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Accións"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Contidos"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1466
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Axuda"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Preferencias"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Saír"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Enviar unha _mensaxe..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Ver"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "Por favor, agarde mentres se solicita a listaxe de comandos..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Buscar"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Engadir un _contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5510
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "Información"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1317
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "I_r"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Enderezo:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Rexistrar en"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "De:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Responder esta mensaxe:"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Enviar"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Enviar a mensaxe"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Enviar a mensaxe e pechar a fiestra"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "A:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Enviar e pechar"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_torizar"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
@@ -2936,187 +2681,202 @@ msgstr ""
 "Denegar a autorización do contacto para que non poida saber cando estou "
 "conectado"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Solicitude de subscrición"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "JID do contacto co que quere conversar"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Sen sons"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enviar mensaxe"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Amosar todos os _eventos pendentes"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Es_tado"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Grupos de charla"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Accións</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Configuración</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID de Jabber:"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Configuración</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Descrición</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personalizado</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Comentarios"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Configurar a sala"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Contacto"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Información"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Máis"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "Imaxe:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Sons</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfico de Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada de XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activar"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IC"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modificar a conta..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "JID local"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Un cliente de Jabber de GTK"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Información"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3144,7 +2904,7 @@ msgstr "No grupo"
 msgid "Text"
 msgstr ""
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr ""
 
@@ -3288,134 +3048,134 @@ msgstr "Sueco"
 msgid "Chinese (Ch)"
 msgstr "Chinés (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Idioma do corrector"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Non está dispoñíbel ningunha conexión"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "nove"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Alcume"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "_Letra:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Información"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1420 ../src/chat_control.py:1883
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifrado activado"
 
 #. Add to roster
-#: ../src/chat_control.py:1445 ../src/common/contacts.py:157
-#: ../src/common/contacts.py:274 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:243 ../src/dialogs.py:1060 ../src/dialogs.py:1972
-#: ../src/dialogs.py:2001 ../src/gui_interface.py:606
+#: ../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:1575 ../src/roster_window.py:1577
-#: ../src/roster_window.py:1892 ../src/roster_window.py:3195
-#: ../src/roster_window.py:3221
+#: ../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
 msgid "Not in Roster"
 msgstr "Non está na listaxe"
 
-#: ../src/chat_control.py:1489
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Listaxe de transferencias activas, rematadas e detidas"
 
-#: ../src/chat_control.py:1492
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1573
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1751
+#: ../src/chat_control.py:1812
 #, 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:1863 ../src/dialogs.py:4619
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1864
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1873
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1918
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1920
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1920
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar a autenticación"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1928
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar a autenticación"
@@ -3423,58 +3183,58 @@ 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:1935
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2075
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2084
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:2087
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2089
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2094
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2096
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/chat_control.py:2133 ../src/chat_control.py:2146
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensaxe está cifrada]"
 
-#: ../src/chat_control.py:2139
+#: ../src/chat_control.py:2203
 #, 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:2408
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Acaba de recibir unha mensaxe nova de \"%s\""
 
-#: ../src/chat_control.py:2409
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3482,22 +3242,22 @@ msgstr ""
 "Se pecha este separador e ten o historial desactivado, esta mensaxe "
 "perderase."
 
-#: ../src/chat_control.py:2552 ../src/common/connection_handlers.py:2158
-#: ../src/common/connection_handlers.py:2204
-#: ../src/common/connection_handlers.py:2398
-#: ../src/common/connection_handlers.py:2543 ../src/common/connection.py:432
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2553
+#: ../src/chat_control.py:2620
 #, 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:2791
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
@@ -3506,23 +3266,33 @@ msgstr "%(nick)s está agora %(status)s"
 msgid "creating logs database"
 msgstr "a crear a base de datos de rexistros"
 
-#: ../src/common/check_paths.py:122 ../src/common/check_paths.py:133
-#: ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "a crear a base de datos de rexistros"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:123 ../src/common/check_paths.py:134
-#: ../src/common/check_paths.py:141 ../src/common/check_paths.py:149
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim pecharase agora"
 
-#: ../src/common/check_paths.py:148
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:164
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "a crear un directorio %s"
@@ -3593,10 +3363,10 @@ msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:212 ../src/common/contacts.py:136
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1579 ../src/roster_window.py:1581
-#: ../src/roster_window.py:5139
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Grupos de charla"
@@ -3710,9 +3480,9 @@ msgstr ""
 "Listaxe (separada por espazos) de filas (contas e grupos) que están caídas."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:487
-#: ../src/common/optparser.py:283 ../src/common/optparser.py:479
-#: ../src/common/optparser.py:513 ../src/gui_interface.py:3231
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Por defecto"
@@ -3992,11 +3762,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:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -4005,7 +3775,7 @@ msgstr ""
 "non tivo unha circunstancia a última vez ou se ten gardada unha demasiada "
 "antiga."
 
-#: ../src/common/config.py:230
+#: ../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."
@@ -4013,7 +3783,7 @@ msgstr ""
 "Se é falso, o Gajim nunca máis amosará a liña de estado cando un contacto "
 "cambie o seu estado ou a súa mensaxe de estado"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:232
 #, fuzzy
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
@@ -4028,30 +3798,30 @@ msgstr ""
 "mensaxes de estado. Se é \"in_and_out\", o Gajim só amosará as entradas e as "
 "saídas no grupo de conversa."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 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:234
+#: ../src/common/config.py:235
 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:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Non amosar a circunstancia para o transporte en si mesmo"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Non amosar a listaxe na barra de tarefas."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -4060,7 +3830,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:241
+#: ../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 "
@@ -4071,7 +3841,7 @@ msgstr ""
 "envío de información SHA no grupo de charla."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -4092,33 +3862,33 @@ msgstr ""
 "envíase a unha fiestra específica. Nota: cambie esta opción require "
 "reiniciar o Gajim para que os cambios teñan efecto."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Oculta os botóns nas fiestras de grupo de charla."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Oculta o báner nunha fiestra de grupo de charla"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 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:250
+#: ../src/common/config.py:251
 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:251
+#: ../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."
@@ -4126,17 +3896,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:252
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Sangría cando se use unha combinación de alcumes consecutivos."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Enviar a mensaxe e pechar a fiestra"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4145,13 +3915,13 @@ msgstr ""
 "Listaxe de cores que se empregarán para colorear o alcume nos grupos de "
 "charla."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -4159,7 +3929,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:257
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -4168,7 +3938,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:258
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -4177,7 +3947,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:260
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -4188,95 +3958,107 @@ 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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
 msgstr ""
 
-#: ../src/common/config.py:279
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:284
+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."
@@ -4284,79 +4066,84 @@ msgstr ""
 "A prioridade cambiará automaticamente segundo o seu estado. As prioridades "
 "están definidas nas opcións de autoprioridade_*"
 
-#: ../src/common/config.py:299
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:308
 #, 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:306
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:308
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:310
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:311
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:314
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:328
+#: ../src/common/config.py:334
 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:332
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Corrección Jabberd2"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4364,125 +4151,130 @@ 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:349
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:358
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:421
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Está o OpenPGP activado para este contacto?"
 
-#: ../src/common/config.py:422
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:423 ../src/common/config.py:426
+#: ../src/common/config.py:433 ../src/common/config.py:436
 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:432
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "estado separado por espazos ou all"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'si', 'non' ou 'ambos'"
 
-#: ../src/common/config.py:434 ../src/common/config.py:436
-#: ../src/common/config.py:437 ../src/common/config.py:440
-#: ../src/common/config.py:441
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'si', 'non' ou ''"
 
-#: ../src/common/config.py:447 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "A durmir"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Volvo nuns minutos."
 
-#: ../src/common/config.py:449 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:449
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, déixeme unha mensaxe."
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:450
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Estou a ver un filme."
 
-#: ../src/common/config.py:451 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "A traballar"
 
-#: ../src/common/config.py:451
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Estou a traballar."
 
-#: ../src/common/config.py:452
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:452
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Estou a falar por teléfono."
 
-#: ../src/common/config.py:453
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Fóra"
 
-#: ../src/common/config.py:453
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Estou fóra a gozar da vida."
 
-#: ../src/common/config.py:464
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Estou dispoñíbel."
 
-#: ../src/common/config.py:465
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Estou libre para falar."
 
-#: ../src/common/config.py:466 ../src/config.py:1534
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Volvo axiña"
 
-#: ../src/common/config.py:467
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Non estou dispoñíbel."
 
-#: ../src/common/config.py:468
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Non molestar."
 
-#: ../src/common/config.py:469 ../src/common/config.py:470
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Adeus!"
 
-#: ../src/common/config.py:480
+#: ../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."
@@ -4491,106 +4283,98 @@ msgstr ""
 "palabras de muc_highlight_words, ou cuando unha mensaxe dun grupo de charla "
 "contén o teu alcume."
 
-#: ../src/common/config.py:481
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Son para reproducir cando chega calquera mensaxe MUC"
 
-#: ../src/common/config.py:490 ../src/common/optparser.py:297
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:494 ../src/common/optparser.py:283
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "ultramariño"
 
-#: ../src/common/config.py:498
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:502
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "mariño"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Non se pode cargar o módulo inactivo"
 
-#: ../src/common/connection_handlers.py:257
-msgid "Wrong host"
-msgstr "Host errado"
-
-#: ../src/common/connection_handlers.py:258
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:723
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "A información de rexistro para o transporte %s non chegou a tempo"
 
-#: ../src/common/connection_handlers.py:730
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Rexistrar %s"
 
-#: ../src/common/connection_handlers.py:731
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:733
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection_handlers.py:733
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1037
-#: ../src/common/connection_handlers.py:2156
-#: ../src/common/connection_handlers.py:2202
-#: ../src/common/connection_handlers.py:2396
-#: ../src/common/connection_handlers.py:2541 ../src/common/connection.py:430
-#: ../src/gajim.py:353
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1260 ../src/common/connection.py:1431
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/common/connection_handlers.py:1261 ../src/common/connection.py:1432
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1977 ../src/common/connection.py:245
-#: ../src/config.py:1996 ../src/config.py:2005 ../src/config.py:2064
-#: ../src/config.py:3416 ../src/dataforms_widget.py:577 ../src/dialogs.py:2779
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/common/connection_handlers.py:1978
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2159
-#: ../src/common/connection_handlers.py:2205
-#: ../src/common/connection_handlers.py:2399
-#: ../src/common/connection_handlers.py:2544 ../src/common/connection.py:433
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2251
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alcume non permitido: %s"
@@ -4598,77 +4382,77 @@ msgstr "Alcume non permitido: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2346
-#: ../src/common/connection_handlers.py:2354
-#: ../src/common/connection_handlers.py:2360
-#: ../src/common/connection_handlers.py:2363
-#: ../src/common/connection_handlers.py:2366
-#: ../src/common/connection_handlers.py:2370 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Non se puido entrar no grupo de charla"
 
-#: ../src/common/connection_handlers.py:2347
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2355
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/common/connection_handlers.py:2361
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Non existe o grupo de charla."
 
-#: ../src/common/connection_handlers.py:2364
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "A creación de grupos de charla está restrinxida."
 
-#: ../src/common/connection_handlers.py:2367
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "É necesario usar o alcume rexistrado."
 
-#: ../src/common/connection_handlers.py:2371
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non está na listaxe de membros"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/common/connection_handlers.py:2422
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2453
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2474
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2476
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "solicitude de eliminación de subscrición de %s"
 
-#: ../src/common/connection_handlers.py:2478
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "xa non estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2673
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4808,28 +4592,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:246 ../src/dialogs.py:2780
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:268
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:271
+#: ../src/common/connection.py:274
 #, 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:319
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensaxe está *cifrada* (Mira :JEP:`27`]"
 
-#: ../src/common/connection.py:420
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4838,156 +4622,156 @@ msgstr ""
 "Asunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:770
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Perdeuse a conexión da conta \"%s\""
 
-#: ../src/common/connection.py:771
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Reconectar manualmente."
 
-#: ../src/common/connection.py:783
+#: ../src/common/connection.py:802
 #, 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:817
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:830
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:845
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "A resposta non é válida"
 
-#: ../src/common/connection.py:846
+#: ../src/common/connection.py:865
 #, 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:1127 ../src/common/connection.py:1256
-#: ../src/common/connection.py:1735
-#: ../src/common/zeroconf/connection_zeroconf.py:191
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:1128 ../src/gui_interface.py:700
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Comprobe a súa conexión ou probe máis tarde."
 
-#: ../src/common/connection.py:1133
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/common/connection.py:1146
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:1177 ../src/common/connection.py:1236
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non se pode conectar a \"%s\""
 
-#: ../src/common/connection.py:1178 ../src/common/connection.py:1237
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1203
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1206
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1208
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1257
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Comprobe a súa conexión ou probe máis tarde"
 
-#: ../src/common/connection.py:1288
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Fallou a autenticación con \"%s\""
 
-#: ../src/common/connection.py:1290
+#: ../src/common/connection.py:1309
 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:1354
+#: ../src/common/connection.py:1378
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/common/connection.py:1355
+#: ../src/common/connection.py:1379
 #, 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:1601
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1604
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contactos"
 
-#: ../src/common/connection.py:1769 ../src/common/connection.py:1792
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Non se conseguiu debido ao estado invisíbel"
 
-#: ../src/common/connection.py:2196
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Fallou a conexión"
 
-#: ../src/common/connection.py:2197
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:134 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:606
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/common/contacts.py:138 ../src/common/contacts.py:357
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1463 ../src/gui_interface.py:411
-#: ../src/roster_window.py:848 ../src/roster_window.py:1500
-#: ../src/roster_window.py:1571 ../src/roster_window.py:1573
-#: ../src/roster_window.py:1731
+#: ../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
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:365
+#: ../src/common/contacts.py:374
 #, fuzzy
 msgid "Not in roster"
 msgstr "Non está na listaxe"
@@ -4997,15 +4781,25 @@ msgstr "Non está na listaxe"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
+#: ../src/common/dbus_support.py:54
+#, 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
+#, 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"
+
 #: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
@@ -5202,245 +4996,249 @@ msgstr "Final de semana"
 msgid "Weekend!"
 msgstr "Fin de semana!"
 
-#: ../src/common/helpers.py:149
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Hai un caracter non válido no nome de usuario."
 
-#: ../src/common/helpers.py:154
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "É necesario o enderezo do servidor."
 
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Carácter non válido no nome do host."
 
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Carácter non válido no recurso."
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Non dispoñíbel"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Libre para falar"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Libre para falar"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "En liñ_a"
 
-#: ../src/common/helpers.py:224 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "En líña"
 
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "D_esconectado"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:239
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Invisíbel"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Descoñecido"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Ten erros"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Ningunha"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "_Engadir"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Ningún"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Propietario"
 
-#: ../src/common/helpers.py:302
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:343
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atención á conversa"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "está a facer algo máis"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:349
 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:350
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "Parou de escribir"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "pechou a fiestra de charla"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:617
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:620
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:624
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:627
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:631
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:634
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:637
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1112
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1118
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1121 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1123
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1130 ../src/common/helpers.py:1137
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1170
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/jingle_rtp.py:98
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuración da sala"
 
-#: ../src/common/jingle_rtp.py:99
+#: ../src/common/jingle_rtp.py:107
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5452,19 +5250,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:285
+#: ../src/common/jingle_rtp.py:299
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:288
+#: ../src/common/jingle_rtp.py:302
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:317
+#: ../src/common/jingle_rtp.py:331
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:325
+#: ../src/common/jingle_rtp.py:339
 msgid "video output"
 msgstr ""
 
@@ -5478,17 +5276,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Mensaxes de estado por defecto"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Tamaño: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:52
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: non se pode abrir %s para lectura"
 
-#: ../src/common/optparser.py:292 ../src/common/optparser.py:293
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "ciano"
 
-#: ../src/common/optparser.py:372
+#: ../src/common/optparser.py:376
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "migrando os rexistros da base de datos aos índices"
@@ -6190,19 +6045,19 @@ msgstr ""
 msgid "Writing"
 msgstr "A traballar"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6210,12 +6065,12 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:90
+#: ../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:91
+#: ../src/common/socks5.py:92
 #, fuzzy
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
@@ -6231,11 +6086,11 @@ msgid ""
 "went wrong.]"
 msgstr ""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:180
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Erro de Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6244,46 +6099,46 @@ msgstr ""
 "%s\n"
 "A mensaxaría de ligazón local podería non funcionar correctamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 #, 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:201
-#: ../src/common/zeroconf/connection_zeroconf.py:205
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Non foi posíbel iniciar o servizo local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Non foi posíbel ligar ao porto %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:206
-#: ../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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 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:284
-#: ../src/common/zeroconf/connection_zeroconf.py:295
-#: ../src/common/zeroconf/connection_zeroconf.py:309
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, 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:326
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 #, 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:336
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 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:361
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6296,26 +6151,22 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erro ao engadir o servizo. %s"
 
-#: ../src/config.py:164 ../src/config.py:622
-msgid "Disabled"
-msgstr "Desactivado"
-
-#: ../src/config.py:390
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensaxes de estado por defecto"
 
-#: ../src/config.py:399
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:690 ../src/dialogs.py:1364
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Non está dispoñíbel o dicionario para o idioma %s"
 
-#: ../src/config.py:691
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6324,72 +6175,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:1149
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "título da mensaxe de estado"
 
-#: ../src/config.py:1149
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "texto da mensaxe de estado"
 
 #. Name column
-#: ../src/config.py:1450 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3012 ../src/disco.py:830 ../src/disco.py:1689
-#: ../src/disco.py:1991 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1543
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Quere reconectarse agora?"
 
-#: ../src/config.py:1544
+#: ../src/config.py:1586
 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:1676 ../src/config.py:1801
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP non se pode usar neste ordenador"
 
-#: ../src/config.py:1841 ../src/config.py:1885
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Acontecementos sen ler"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Lea todos os eventos pendentes antes de eliminar esta conta."
 
-#: ../src/config.py:1868
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Comezou unha charla coa conta %s"
 
-#: ../src/config.py:1869
+#: ../src/config.py:1918
 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:1881 ../src/config.py:2404 ../src/config.py:2438
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Está actualmente conectado ao servidor"
 
-#: ../src/config.py:1882
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:1886
+#: ../src/config.py:1935
 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:1892
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "O nome da conta xa está en uso"
 
-#: ../src/config.py:1893
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6397,148 +6248,148 @@ msgstr ""
 "Este nome xa está en uso por outra das súas contas. Por favor, escolla outro "
 "nome."
 
-#: ../src/config.py:1897 ../src/config.py:1901
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "O nome da conta non é válido"
 
-#: ../src/config.py:1898
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "O nome da conta non pode estar baleiro."
 
-#: ../src/config.py:1902
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "O nome da conta non pode conter espazos."
 
-#: ../src/config.py:1977
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "Xestionar as contas"
 
-#: ../src/config.py:1978
+#: ../src/config.py:2027
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/config.py:2006
+#: ../src/config.py:2055
 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:2214 ../src/config.py:3462
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:2215 ../src/config.py:3463
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "O porto personalizado debe ser un número de porto"
 
-#: ../src/config.py:2236
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Produciuse un erro ao obter as chaves secretas"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2286
 #, 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:2271
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Selección da chave de OpenPGP"
 
-#: ../src/config.py:2272
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Elixa a súa chave de OpenPGP"
 
-#: ../src/config.py:2279
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Non está dispoñíbel esta conta"
 
-#: ../src/config.py:2280
+#: ../src/config.py:2329
 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:2287 ../src/dialogs.py:2030 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:476 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/config.py:2288
+#: ../src/config.py:2337
 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:2292
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "O seu servidor non admite o vCard"
 
-#: ../src/config.py:2293
+#: ../src/config.py:2342
 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:2405 ../src/config.py:2439
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para cambiar o nome da conta, debe estar desconectado"
 
-#: ../src/config.py:2410
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "A conta local xa existe."
 
-#: ../src/config.py:2411
+#: ../src/config.py:2461
 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:2566
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2568
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Rexistrar %s"
 
 #. list at the beginning
-#: ../src/config.py:2604
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Listaxe de expulsión"
 
-#: ../src/config.py:2605
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Listaxe de membros"
 
-#: ../src/config.py:2606
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Listaxe de propietarios"
 
-#: ../src/config.py:2607
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Listaxe de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2656 ../src/disco.py:837 ../src/history_manager.py:201
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2666
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2673
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Alcume"
 
-#: ../src/config.py:2679
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Posto"
 
-#: ../src/config.py:2706
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "A expulsar..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2708
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6546,11 +6397,11 @@ msgstr ""
 "<b>A quen quere expulsar?</b>\n"
 "\n"
 
-#: ../src/config.py:2710
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "A engadir o membro..."
 
-#: ../src/config.py:2711
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6558,11 +6409,11 @@ msgstr ""
 "<b>A quen quere facer membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "A engadir un propietario..."
 
-#: ../src/config.py:2714
+#: ../src/config.py:2766
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6571,11 +6422,11 @@ msgstr ""
 "<b>A quen quere facer como propietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2716
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "A engadir administrador..."
 
-#: ../src/config.py:2717
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6583,7 +6434,7 @@ msgstr ""
 "<b>A quen quere facer como administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2718
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6600,60 +6451,88 @@ msgstr ""
 "usuario@dominio, dominio/recurso ou enderezo que contén\n"
 "un subdominio."
 
-#: ../src/config.py:2819
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "A eliminar a conta %s"
 
-#: ../src/config.py:2841 ../src/gui_interface.py:1097
-#: ../src/gui_interface.py:1192
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Cifrado desactivado"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/config.py:2842 ../src/gui_interface.py:1172
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza un contrasinal para a conta %s"
 
-#: ../src/config.py:2843 ../src/gui_interface.py:1192
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../src/config.py:2852
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2853
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Se a elimina, perderase a conexión co servidor"
 
-#: ../src/config.py:2951
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Fallou a conexión"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Que quere facer?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Eliminar a _conta unicamente do Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Por defecto"
 
-#: ../src/config.py:2951
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "Todos"
 
-#: ../src/config.py:2952
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Entrar e saír soamente"
 
-#: ../src/config.py:2953
+#: ../src/config.py:3025
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Todos"
 
-#: ../src/config.py:3023
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Novo grupo de charla"
 
-#: ../src/config.py:3056
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Este marcador ten información que non é válida"
 
-#: ../src/config.py:3057
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6661,31 +6540,31 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:3175 ../src/dialogs.py:1828
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3176 ../src/config.py:3190 ../src/config.py:3204
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcume non permitido: %s"
 
-#: ../src/config.py:3189 ../src/config.py:3438
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3203
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "A entrada non é válida"
 
-#: ../src/config.py:3355
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "A conta engadiuse con éxito"
 
-#: ../src/config.py:3356 ../src/config.py:3362
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6695,34 +6574,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:3361
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/config.py:3399
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/config.py:3401
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Debe pórlle un nome para configurar esta conta."
 
-#: ../src/config.py:3439
+#: ../src/config.py:3525
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Especifique o novo alcume que quere usar:"
 
-#: ../src/config.py:3495 ../src/gui_interface.py:1841
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/config.py:3496 ../src/gui_interface.py:1842
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3566
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6732,7 +6611,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3572 ../src/gui_interface.py:1866
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6740,73 +6619,73 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3599 ../src/config.py:3626
+#: ../src/config.py:3691 ../src/config.py:3724
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Produciuse un erro durante a creación da conta"
 
-#: ../src/config.py:3693
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "O nome da conta está en uso"
 
-#: ../src/config.py:3694
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Xa ten unha conta en que emprega este nome"
 
-#: ../src/config.py:3847
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:3855
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Acontecemento"
 
-#: ../src/config.py:3890
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Recibiuse a primeira mensaxe"
 
-#: ../src/config.py:3891
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:3893
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Recibiuse unha mensaxe nova"
 
-#: ../src/config.py:3894
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Nome de contacto"
 
-#: ../src/config.py:3895
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Contacto desconectado"
 
-#: ../src/config.py:3896
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Enviouse a mensaxe"
 
-#: ../src/config.py:3897
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Remarcado da mensaxe de grupo de charla"
 
-#: ../src/config.py:3898
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Recibiuse unha mensaxe de grupo de charla"
 
-#: ../src/config.py:3899
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Recibiuse un correo de GMail"
 
-#: ../src/conversation_textview.py:598
+#: ../src/conversation_textview.py:599
 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:617
+#: ../src/conversation_textview.py:618
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6815,45 +6694,45 @@ msgstr ""
 "O texto que está debaixo desta liña foi o que se dixo desde a última vez que "
 "lle prestou atención a esta sala de charla"
 
-#: ../src/conversation_textview.py:736
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Saír"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Accións para \"%s\""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Buscalo no _Dicionario"
 
-#: ../src/conversation_textview.py:777
+#: ../src/conversation_textview.py:779
 #, 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:790
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" no URL da busca web"
 
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Buscalo na rede"
 
-#: ../src/conversation_textview.py:799
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "_Abrir como ligazón"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1285
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6861,7 +6740,7 @@ msgstr[0] "Onte"
 msgstr[1] "Onte"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1320 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Asunto: %s\n"
@@ -6972,73 +6851,73 @@ 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "A ID de usuario non é válida"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Esta ID de usuario non contén un recurso."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Gustaríame engadilo á miña listaxe de contactos"
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "O contacto xa está na listaxe"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Xa engadiu este contacto á súa listaxe."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ID de usuario:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Versión de GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Versión de PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Desenvolvedores actuais:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Desenvolvedores anteriores:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "AGRADECEMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1197
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Fran Alburquerque <membriskhan@gmail.com>"
 
-#: ../src/dialogs.py:1365
+#: ../src/dialogs.py:1395
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -7049,110 +6928,110 @@ msgstr ""
 "Ten que instalar o dicionario %s para usar o corrector ou elixir outra "
 "lingua e logo definir a opción speller_language."
 
-#: ../src/dialogs.py:1829 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:1947
+#: ../src/dialogs.py:2044
 #, 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:1950
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitude de subscrición de %s"
 
-#: ../src/dialogs.py:2025 ../src/gui_interface.py:2576
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Xa está na sala %s"
 
-#: ../src/dialogs.py:2031
+#: ../src/dialogs.py:2128
 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:2073
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar nun grupo de charla coa conta %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "O nome da conta non é válido"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, 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:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1774
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "A ID de Jabber non é válida para o grupo de charla"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, 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:2182 ../src/groupchat_control.py:1775
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "A ID de Jabber para o grupo de charla contén caracteres que non se permiten."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Isto non é un grupo de charla"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s non é o nome dun grupo de charla."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 #, 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:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "A conta \"%s\" está conectada ao servidor"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar a charla coa conta %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Iniciar a charla"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7161,171 +7040,171 @@ msgstr ""
 "enviar unha mensaxe de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2765 ../src/dialogs.py:2927
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Conexión non dispoñíbel"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2766 ../src/dialogs.py:2928
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrese de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "A ID de Jabber non é válida"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Non se pode analizar \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Sen unha conexión, non pode cambiar o seu contrasinal."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "O contrasinal non é válido"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Debe introducir un contrasinal."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 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:2467 ../src/notify.py:263 ../src/notify.py:499
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:2469 ../src/notify.py:271 ../src/notify.py:501
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:2471 ../src/notify.py:292 ../src/notify.py:344
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Mensaxe nova"
 
 #. single message
-#: ../src/dialogs.py:2471 ../src/notify.py:275 ../src/notify.py:345
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Mensaxe nova"
 
 #. private message
-#: ../src/dialogs.py:2472 ../src/notify.py:281 ../src/notify.py:345
-#: ../src/notify.py:504
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Mensaxe privada nova"
 
-#: ../src/dialogs.py:2472 ../src/gui_interface.py:1305 ../src/notify.py:513
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Correo electrónico novo"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1368 ../src/notify.py:506
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1273
-#: ../src/gui_interface.py:1337 ../src/notify.py:508
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Produciuse un erro na transferencia do ficheiro"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1413
-#: ../src/gui_interface.py:1435 ../src/gui_interface.py:1452
-#: ../src/notify.py:510
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2479 ../src/gui_interface.py:1416 ../src/notify.py:511
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Detívose a transferencia do ficheiro"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1116 ../src/notify.py:515
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Convite a grupo de charla"
 
-#: ../src/dialogs.py:2483 ../src/notify.py:255 ../src/notify.py:517
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Un contacto cambiou o seu estado"
 
-#: ../src/dialogs.py:2684
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensaxe nova coa conta %s"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Entrou unha mensaxe nova na conta %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Mensaxe:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2691
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2714
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Recibida %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2737
+#: ../src/dialogs.py:2880
 #, 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:2816
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2817
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribiu:\n"
 
-#: ../src/dialogs.py:2866
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2956
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Atascado"
 
-#: ../src/dialogs.py:2956
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:2957
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Eliminar"
 
-#: ../src/dialogs.py:2985
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7333,152 +7212,157 @@ msgid ""
 msgstr "Gustaríame engadilo á miña listaxe de contactos."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3001 ../src/dialogs.py:3047
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 #, fuzzy
 msgid "Add"
 msgstr "Enderezo"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3078
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3009
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Eliminar"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID de Jabber:"
 
-#: ../src/dialogs.py:3015
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3123
+#: ../src/dialogs.py:3318
 #, 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:3137
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Engadir un _contacto"
 
-#: ../src/dialogs.py:3174
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/dialogs.py:3227
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Listaxe de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3231
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Listaxe de privacidade para %s"
 
-#: ../src/dialogs.py:3287
+#: ../src/dialogs.py:3482
 #, 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:3292
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Orde: %s, acción: %s"
 
-#: ../src/dialogs.py:3336
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar unha regra</b>"
 
-#: ../src/dialogs.py:3447
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Engadir unha regra</b>"
 
-#: ../src/dialogs.py:3547
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listaxes de privacidade para %s"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Listaxes de privacidade"
 
-#: ../src/dialogs.py:3619
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "O nome de listaxe non é válido"
 
-#: ../src/dialogs.py:3620
+#: ../src/dialogs.py:3815
 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:3652
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está expulsado deste grupo de charla."
 
-#: ../src/dialogs.py:3655
+#: ../src/dialogs.py:3850
 #, 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:3657
+#: ../src/dialogs.py:3852
 #, 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:3665
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3728
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Elixir un son"
 
-#: ../src/dialogs.py:3738 ../src/dialogs.py:3794
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3743
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:3781
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Elixir unha imaxe"
 
-#: ../src/dialogs.py:3799
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Imaxes"
 
-#: ../src/dialogs.py:3866
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Cando %s estea:"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Engadir unha notificación especial para %s"
 
-#: ../src/dialogs.py:3943
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Condición"
 
-#: ../src/dialogs.py:4063
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "cando estea "
 
-#: ../src/dialogs.py:4539
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7486,38 +7370,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4542
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4548 ../src/dialogs.py:4632
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4554
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4562 ../src/dialogs.py:4613 ../src/dialogs.py:4626
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4567
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4578
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4579
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7527,77 +7411,77 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4580
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4614
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4620
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4627
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4633
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4698
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4700
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4702
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4706
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Conferencia"
 
-#: ../src/disco.py:477
+#: ../src/disco.py:512
 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:553
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Xestión de servizos coa conta %s"
 
-#: ../src/disco.py:555
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Xestión de servizos"
 
-#: ../src/disco.py:705
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "O servizo non se achou"
 
-#: ../src/disco.py:706
+#: ../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."
@@ -7605,97 +7489,102 @@ msgstr ""
 "Non hai servizo neste enderezo ou non está a responder. Comprobe o enderezo "
 "e ténteo máis tarde."
 
-#: ../src/disco.py:710 ../src/disco.py:1046
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "O servizo non é navegábel"
 
-#: ../src/disco.py:711
+#: ../src/disco.py:749
 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:750 ../src/disco.py:760
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "O nome de usuario non é válido"
 
-#: ../src/disco.py:814
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Navegar %s coa conta %s"
 
-#: ../src/disco.py:858
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1047
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Este servizo non contén elementos para navegar."
 
-#: ../src/disco.py:1287
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "Executar o _comando..."
 
-#: ../src/disco.py:1297 ../src/disco.py:1468
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "_Subscribir"
 
-#: ../src/disco.py:1509
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1699
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1707
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Descrición"
 
 #. Id column
-#: ../src/disco.py:1715
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1780 ../src/gui_interface.py:3068
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Engadir esta sala aos marcadores"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "O marcador xa se definiu"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3069
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" xa está nos seus marcadores."
 
-#: ../src/disco.py:1790 ../src/gui_interface.py:3082
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "O marcador engadiuse con éxito"
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3083
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2000
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Engadiuse"
 
-#: ../src/disco.py:2008
+#: ../src/disco.py:2046
 #, fuzzy
 msgid "Node"
 msgstr "Ningún"
 
-#: ../src/disco.py:2072
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Publicación nova"
 
-#: ../src/disco.py:2078
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Engadir"
 
-#: ../src/disco.py:2084
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Eliminar"
 
@@ -7744,7 +7633,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7910,99 +7799,91 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "Características dos servidores"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Hora"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
 #: ../src/history_manager.py:522
 msgid "You"
 msgstr "Vostede"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Remitente: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Gardouse en: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Rematou a transferencia do ficheiro"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Abrir un cartafol de contido"
+
+#: ../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:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Mensaxe de erro: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Detívose a transferencia do ficheiro"
@@ -8011,7 +7892,7 @@ msgstr "Detívose a transferencia do ficheiro"
 msgid "Choose File to Send..."
 msgstr "Elixa un ficheiro para enviar..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Descrición: %s"
@@ -8044,34 +7925,34 @@ msgstr "Descrición: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quere enviarlle un ficheiro:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:888
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:890
+#: ../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 ""
 "Xa existe un ficheiro con este nome e non ten permiso para o sobreescribir"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:894
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Este ficheiro xa existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:894
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:901
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, 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:902
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Non ten autorización para crear ficheiros neste directorio."
 
@@ -8107,77 +7988,57 @@ msgstr "Ficheiro: "
 msgid "It is not possible to send empty files"
 msgstr "Non se pode enviar ficheiros baleiros"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: ../src/gajim.py:141
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "O Gajim precisa o Xserver para funcionar. A abortar..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "O Gajim precisa un PyGTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
 msgid "Gajim needs GTK 2.16 or above"
 msgstr "O Gajim precisa un GTK 2.6 ou superior"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
 msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "O Gajim precisa un GTK 2.6 ou superior para funcionar. A abortar..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "A biblioteca GTK+ precisa un soporte de libglade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Por favor, elimine a súa biblioteca GTK+ actual e instale a última versión "
-"estábel desde %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Por favor, asegúrese de que GTK+ e PyGTK teñen un soporte libglade no seu "
-"sistema."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "O Gajim precisa un PySQLite2 para funcionar"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa un pywin32 para funcionar"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8187,11 +8048,11 @@ msgstr ""
 "obtelo en %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:327
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "O Gajim xa está a se executar"
 
-#: ../src/gajim.py:328
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8236,8 +8097,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "conta"
 
@@ -8259,14 +8120,17 @@ msgid "status"
 msgstr "estado"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "un de: desconectado, en liña, libre para falar, ausente, non dispoñíbel, "
 "ocupado, invisíbel"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "mensaxe"
 
@@ -8508,79 +8372,98 @@ msgstr ""
 "a todas as contas"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "contido da mensaxe"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr ""
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "nick"
 msgstr "Alcume"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Non se achou o alcume: %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "password"
 msgstr "Contrasinal: "
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Os contrasinais non coinciden"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Por favor, comprobe se o avahi-daemon está en execución."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Amosa ou oculta a fiestra da listaxe de contactos"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Non se atopa o argumento \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8589,31 +8472,31 @@ msgstr ""
 "'%s' non está na súa listaxe de contactos.\n"
 "Por favor, especifique unha conta para enviar a mensaxe."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Non ten contas activas"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumentos"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "Non se encontrou %s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8622,7 +8505,7 @@ msgstr ""
 "Modo de uso: %s comando [argumentos]\n"
 "Comando é un de:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8631,7 +8514,7 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8640,7 +8523,11 @@ msgstr ""
 "O argumento \"%s\" non se especificou. \n"
 "Escriba \"%s help %s\" para máis información"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Host errado"
@@ -8671,199 +8558,200 @@ msgstr "Non pode eliminar o tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primeiro elixa outro distinto como tema actual."
 
-#: ../src/groupchat_control.py:163
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "O envío da mensaxe privada fallou"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:165
+#: ../src/groupchat_control.py:166
 #, 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:435
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Introducir alcume"
 
-#: ../src/groupchat_control.py:613
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Historial de conversas"
 
-#: ../src/groupchat_control.py:615
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Conexión"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1224 ../src/gui_interface.py:1045
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1227
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1229
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A súa conta nova creouse con éxito"
 
-#: ../src/groupchat_control.py:1232
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1238
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulsado por %(reason)s"
 
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1231
 #, 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:1252
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi expulsado: %(reason)s"
 
-#: ../src/groupchat_control.py:1256
+#: ../src/groupchat_control.py:1245
 #, 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:1268 ../src/groupchat_control.py:1363
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Coñéceselle como %s"
 
-#: ../src/groupchat_control.py:1284 ../src/gui_interface.py:889
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s coñéceselle como %s"
 
-#: ../src/groupchat_control.py:1322 ../src/groupchat_control.py:1326
-#: ../src/groupchat_control.py:1331
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1323
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Afiliación:"
 
-#: ../src/groupchat_control.py:1328
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1333
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1412
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1416
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1431
+#: ../src/groupchat_control.py:1420
 #, 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:1435
+#: ../src/groupchat_control.py:1424
 #, 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:1464
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s saíu"
 
-#: ../src/groupchat_control.py:1469
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou no grupo de charla"
 
-#: ../src/groupchat_control.py:1471 ../src/gui_interface.py:914
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 está agora %(status)s"
 
-#: ../src/groupchat_control.py:1704
+#: ../src/groupchat_control.py:1688
 #, 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:1706
+#: ../src/groupchat_control.py:1690
 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:1710 ../src/gui_interface.py:1165
-#: ../src/gui_interface.py:1924 ../src/gui_interface.py:1959
-#: ../src/message_window.py:227 ../src/roster_window.py:2659
-#: ../src/roster_window.py:3302 ../src/roster_window.py:3991
+#: ../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 "_Non me preguntar outra vez"
 
-#: ../src/groupchat_control.py:1743
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Cambiando o asunto"
 
-#: ../src/groupchat_control.py:1744
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Especifique o asunto novo:"
 
-#: ../src/groupchat_control.py:1751
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Cambiando o alcume"
 
-#: ../src/groupchat_control.py:1752
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Especifique o novo alcume que quere usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1781
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrición: %s"
 
-#: ../src/groupchat_control.py:1782
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1965
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "A expulsar %s"
 
-#: ../src/groupchat_control.py:1966 ../src/groupchat_control.py:2289
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Debe especificar un motivo debaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2288
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "A expulsar %s"
@@ -8883,61 +8771,61 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Informar do erro"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detalles"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:202 ../src/gtkgui_helpers.py:217
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: non se pode abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:393
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gtkgui_helpers.py:396
+#: ../src/gtkgui_helpers.py:403
 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:437
+#: ../src/gtkgui_helpers.py:444
 #, 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:806
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:807
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:808
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:874
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Extensión non admitida"
 
-#: ../src/gtkgui_helpers.py:875
+#: ../src/gtkgui_helpers.py:888
 #, 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:911
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Gardar a imaxe como..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8948,165 +8836,165 @@ msgstr ""
 "ocupante. \n"
 "Por favor, especifique outro alcume abaixo:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Acepta esta solicitude?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: ../src/gui_interface.py:203 ../src/notify.py:519
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Fallou a conexión"
 
-#: ../src/gui_interface.py:542 ../src/gui_interface.py:546
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:556 ../src/gui_interface.py:570
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "produciuse un erro mentres se enviaba %s ( %s )"
 
-#: ../src/gui_interface.py:595 ../src/notify.py:521
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Solicitude de subscrición"
 
-#: ../src/gui_interface.py:620
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gui_interface.py:621
+#: ../src/gui_interface.py:688
 #, 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:633
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "O contacto \"%s\" eliminou a súa subscrición"
 
-#: ../src/gui_interface.py:634
+#: ../src/gui_interface.py:702
 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:658 ../src/notify.py:523
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Eliminar"
 
-#: ../src/gui_interface.py:699
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non foi posíbel estabelecer o contacto con \"%s\""
 
-#: ../src/gui_interface.py:981
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1048
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1050
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../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:1056
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1060
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1066
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1098
+#: ../src/gui_interface.py:1131
 #, 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:1130
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1132 ../src/gui_interface.py:1138
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está actualmente conectado sen a súa chave de GPG"
 
-#: ../src/gui_interface.py:1133
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:1137
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:1163
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1163
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1175
+#: ../src/gui_interface.py:1210
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1283
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Hai un correo novo en %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1285
+#: ../src/gui_interface.py:1321
 #, 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:1298
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -9116,103 +9004,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1366
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gui_interface.py:1403 ../src/roster_window.py:1813
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina o contacto da listaxe"
 
-#: ../src/gui_interface.py:1405 ../src/roster_window.py:1815
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro ao ler o ficheiro:"
 
-#: ../src/gui_interface.py:1436
+#: ../src/gui_interface.py:1475
 #, 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:1440
+#: ../src/gui_interface.py:1479
 #, 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:1453
+#: ../src/gui_interface.py:1492
 #, 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:1457
+#: ../src/gui_interface.py:1496
 #, 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:1562
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1569
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "En cada _mensaxe"
 
-#: ../src/gui_interface.py:1643
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gui_interface.py:1644
+#: ../src/gui_interface.py:1687
 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:1656
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1669
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1680
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1707
+#: ../src/gui_interface.py:1752
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Conflito co nome de usuario"
 
-#: ../src/gui_interface.py:1708
+#: ../src/gui_interface.py:1753
 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:1755
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quere enviarlle un ficheiro."
 
-#: ../src/gui_interface.py:1758
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Solicitude de transferencia de ficheiro"
 
-#: ../src/gui_interface.py:1863
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1864
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9220,15 +9108,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1869
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1889
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1890
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9239,90 +9127,100 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1920 ../src/gui_interface.py:1955
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Conexión"
 
-#: ../src/gui_interface.py:1921
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1923 ../src/gui_interface.py:1958
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1956
+#: ../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:1976
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr "Vai crear un metacontacto. Está seguro de que quere continuar?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gui_interface.py:1977
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2531 ../src/gui_interface.py:2553
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifrado desactivado"
 
-#: ../src/gui_interface.py:2532
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2554
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2582 ../src/roster_window.py:3442
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2949
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Non se poden gardar as preferencias"
 
-#: ../src/gui_interface.py:3441
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "É necesario o contrasinal"
 
-#: ../src/gui_interface.py:3442
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza o contrasinal GPG para a conta %s"
 
-#: ../src/gui_interface.py:3456
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3457
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
 #. ask again
-#: ../src/gui_interface.py:3466
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "O contrasinal é incorrecto"
 
-#: ../src/gui_interface.py:3467
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, volva escribir o seu contrasinal de GPG ou prema Cancelar."
 
@@ -9346,7 +9244,7 @@ msgstr "Contactos"
 
 #. holds time
 #: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:97
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Data"
 
@@ -9357,7 +9255,7 @@ msgstr "Alcume"
 
 #. holds message
 #: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:105
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Mensaxe"
 
@@ -9443,38 +9341,38 @@ msgstr "O estado é agora: %(status)s: %(status_msg)s "
 msgid "Status is now: %(status)s"
 msgstr "O estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "Non foi posíbel cargar a imaxe"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non está conectado ao servidor"
 
-#: ../src/message_window.py:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Charlas"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Grupos de charla"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Charlas privadas"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Mensaxes"
 
@@ -9486,47 +9384,47 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s cambiou o seu estado"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectouse"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectouse"
 
-#: ../src/notify.py:277
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/notify.py:284
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensaxe privada desde o grupo de charlas %s"
 
-#: ../src/notify.py:286
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:289
+#: ../src/notify.py:291
 #, fuzzy, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/notify.py:294
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Mensaxe nova de %(nickname)s"
 
-#: ../src/notify.py:561
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "nove"
@@ -9535,12 +9433,12 @@ msgstr "nove"
 msgid "Retrieving profile..."
 msgstr "A recuperar o perfil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2846
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "Camiño do ficheiro"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2849
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "Non existe o grupo de charla."
@@ -9548,7 +9446,7 @@ msgstr "Non existe o grupo de charla."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2851 ../src/roster_window.py:2862
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Non foi posíbel cargar a imaxe"
 
@@ -9580,51 +9478,51 @@ msgstr ""
 "Produciuse un erro mentres se publicaba a súa información persoal, probe de "
 "novo máis tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Contas combinadas"
 
-#: ../src/roster_window.py:1870
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Enviouse a autorización"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" poderá saber o seu estado."
 
-#: ../src/roster_window.py:1893
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Enviouse a solicitude de subscrición"
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1941
 #, 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:1908
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Eliminouse a autorización"
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:1937
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Conectarase a %s sen o OpenPGP"
 
-#: ../src/roster_window.py:2147 ../src/roster_window.py:3395
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 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:2148 ../src/roster_window.py:3396
+#: ../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?"
@@ -9632,28 +9530,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:2174
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2235
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2286
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Está seguro de que quere abandonar a sala \"%s\"?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2332 ../src/roster_window.py:2577
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Cancelar a transferencia"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Ten mensaxes sen ler"
 
-#: ../src/roster_window.py:2333
+#: ../src/roster_window.py:2403
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9662,16 +9571,16 @@ msgstr ""
 "As mensaxes só estarán dispoñíbeis para a súa lectura posterior se ten o "
 "historial activado"
 
-#: ../src/roster_window.py:2578
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Debe lelas antes de eliminar este transporte."
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Eliminarase o transporte \"%s\""
 
-#: ../src/roster_window.py:2582
+#: ../src/roster_window.py:2655
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9679,11 +9588,11 @@ msgid ""
 msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde este transporte"
 
-#: ../src/roster_window.py:2585
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Eliminaranse os transportes"
 
-#: ../src/roster_window.py:2590
+#: ../src/roster_window.py:2663
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9692,69 +9601,69 @@ msgstr ""
 "Xa non poderá enviar e recibir mensaxes a contactos desde estes transportes: "
 "%s"
 
-#: ../src/roster_window.py:2654
+#: ../src/roster_window.py:2731
 #, 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:2656
+#: ../src/roster_window.py:2733
 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:2742
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Renomear o contacto"
 
-#: ../src/roster_window.py:2743
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza un alcume novo para o contacto %s"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Renomear o grupo"
 
-#: ../src/roster_window.py:2751
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza un nome novo para o grupo %s"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2879
 #, 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:2794
+#: ../src/roster_window.py:2880
 #, 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:2833
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Asignar chave de OpenPGP"
 
-#: ../src/roster_window.py:2834
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Seleccione unha chave para lle aplicar ao contacto"
 
-#: ../src/roster_window.py:3211
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Eliminarase o contacto \"%s\" da súa listaxe"
 
-#: ../src/roster_window.py:3213
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3218
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9763,12 +9672,12 @@ msgstr ""
 "ela sempre o/a verá desconectado."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3224
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Que quere facer?"
 
-#: ../src/roster_window.py:3227
+#: ../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."
@@ -9776,16 +9685,16 @@ msgstr ""
 "Ao eliminar este contacto tamén se eliminará a autorización. Este contacto "
 "sempre o/a verá desconectado."
 
-#: ../src/roster_window.py:3230
+#: ../src/roster_window.py:3323
 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:3234
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Os contactos eliminaranse da súa listaxe"
 
-#: ../src/roster_window.py:3239
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9795,32 +9704,32 @@ msgstr ""
 "tamén eliminará as autorizacións resultantes e eles/elas sempre o/a verán "
 "desconectado."
 
-#: ../src/roster_window.py:3296
+#: ../src/roster_window.py:3390
 #, 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:3298
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "A conta non está dispoñíbel"
 
-#: ../src/roster_window.py:3318
+#: ../src/roster_window.py:3412
 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:3898
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "O teu servidor non admite o almacenamento de metacontactos"
 
-#: ../src/roster_window.py:3900
+#: ../src/roster_window.py:4022
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9829,12 +9738,12 @@ msgstr ""
 "O seu servidor non admite almacenar información de metacontactos. Por tanto, "
 "toda a información referente non se gardará na próxima reconexión."
 
-#: ../src/roster_window.py:3985
+#: ../src/roster_window.py:4114
 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:3987
+#: ../src/roster_window.py:4116
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9845,24 +9754,24 @@ msgstr ""
 "Xeralmente se usan cando a mesma persoa ten varias contas de Jabber ou "
 "contas de transportes."
 
-#: ../src/roster_window.py:4102
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "O ficheiro non é válido"
 
-#: ../src/roster_window.py:4113
+#: ../src/roster_window.py:4243
 #, 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:4228
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4234
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Facer %s e %s metacontactos"
@@ -9872,134 +9781,138 @@ msgstr "Facer %s e %s metacontactos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4719 ../src/roster_window.py:4790
-#: ../src/roster_window.py:4799 ../src/statusicon.py:245
-#: ../src/statusicon.py:292 ../src/statusicon.py:298
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "a usar a conta %s"
 
 #. add
-#: ../src/roster_window.py:4806
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "á conta %s"
 
 #. disco
-#: ../src/roster_window.py:4811
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "a usar a conta %s"
 
-#: ../src/roster_window.py:4848 ../src/statusicon.py:308
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Xestionar _marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4868
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:4908
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "para a conta %s"
 
-#: ../src/roster_window.py:4964 ../src/roster_window.py:5062
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Cambiar a mensaxe de estado"
 
-#: ../src/roster_window.py:4988
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:4996
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Publicar"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descubrir os servizos..."
 
-#: ../src/roster_window.py:5140
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5148 ../src/roster_window.py:5316
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Enviar mensaxe ao grupo"
 
-#: ../src/roster_window.py:5156
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "A todos os usuarios"
 
-#: ../src/roster_window.py:5160
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "A todos os usuarios en liña"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5336
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Renomear o contacto"
 
 #. Edit Groups
-#: ../src/roster_window.py:5344
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Editar os grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5399
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "_Enviar mensaxe"
 
 #. Execute Command
-#: ../src/roster_window.py:5445
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Executar o comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5455
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5463
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Amosar os trans_portes"
 
 #. Rename
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "Renomear"
 
-#: ../src/roster_window.py:5533
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5541
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto desconectado"
 
-#: ../src/roster_window.py:5547
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto desconectado"
 
 #. History manager
-#: ../src/roster_window.py:5629
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Historial"
 
-#: ../src/roster_window.py:5640
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Entrar nun outro grupo de charla"
 
-#: ../src/roster_window.py:5807
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Cambiar a mensaxe de estado..."
 
@@ -10034,9 +9947,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -10049,119 +9962,129 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Cambiar a mensaxe de estado..."
 
 #: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Non está na listaxe"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Ocultar este menú"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "ID de Jabber:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Último estado: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " desde %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "Conexión"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto desconectado"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Subscrición: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Modificar a conta"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Detido"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Este servizo non respondeu aínda con información detallada"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10236,6 +10159,314 @@ msgstr ""
 msgid " resource with priority "
 msgstr " recurso con prioridade "
 
+#, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Entrar nun grupo de charla"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Engadir un contacto..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Descubrir os servizos"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "Executar o _comando..."
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "Modificar conta"
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Información persoal"
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "_Iniciar a charla"
+
+#~ msgid "_Status"
+#~ msgstr "E_stado"
+
+#~ msgid "Account Modification"
+#~ msgstr "Modificar a conta"
+
+#~ 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 ""
+#~ "Ao marcar esta opción, o Gajim conectará o porto 5223 cando un servidor "
+#~ "antigo use SSL. Cómpre ter en conta que o Gajim usa un cifrado TLS por "
+#~ "defecto se está dispoñíbel no servidor e que con esta opción se desactiva "
+#~ "o TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "_Editar a información persoal..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Nome do host:"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Se isto está marcado, o Gajim gardará o contrasinal en ~/.gajim/config "
+#~ "para o que unicamente vostede terá acceso de só lectura"
+
+#~ msgid "Port: "
+#~ msgstr "Porto: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Gardar o contrasinal (inseguro)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Enviar paquetes de mantemento de actividade"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Usar _SSL (o antigo)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Adaptar ao estado"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Eliminar MDD"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Enviar a mensaxe do servidor"
+
+#, fuzzy
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Recibir unha mensaxe\n"
+#~ "O contacto está conectado \n"
+#~ "O contacto está desconectado \n"
+#~ "O contacto mudou de estado \n"
+#~ "Mensaxe de grupo de charla realzado \n"
+#~ "Mensaxe de grupo de charla recibida \n"
+#~ "Solicitude de transferencia \n"
+#~ "Transferencia iniciada \n"
+#~ "Transferencia rematada"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "contacto(s)\n"
+#~ "grupo(s)\n"
+#~ "todo o mundo"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Entrar nun grupo de charla"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Copiar o enderezo"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Copiar o enderezo da ligazón"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Abrir o editor de correo"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Abrir a ligazón no navegador"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Iniciar a charla"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Conta\n"
+#~ "Grupo\n"
+#~ "Contacto\n"
+#~ "Báner"
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "Cambiar o _alcume"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "Cambiar o _tema"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Configurar a sala"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Xestionar os marcadores"
+
+#~ msgid "Send _File"
+#~ msgstr "Enviar ficheiro"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Engadir á listaxe de contactos"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Enviar unha mensaxe privada"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Xestionar as contas"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "Eliminar"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Engade o contacto á listaxe"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Engadir esta sala aos marcadores"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Cambiar o _alcume"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "está a prestar atención á conversa"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Prema aquí para inserir unha emoticona (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Todos os estados da charla\n"
+#~ "Só escribindo\n"
+#~ "Desactivado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Detectar automaticamente en cada inicio do Gajim\n"
+#~ "Usar sempre as aplicacións por defecto do GNOME\n"
+#~ "Usar sempre as aplicacións por defecto do KDE\n"
+#~ "Usar sempre as aplicacións por defecto do Xfce\n"
+#~ "Personalizado"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ningún\n"
+#~ "ambos\n"
+#~ "de\n"
+#~ "a"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Eliminar"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "_Engadir un contacto..."
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "Características dos servidores"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Transferencias"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Perfil, Ima_xe"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Contas"
+
+#~ msgid "_Contents"
+#~ msgstr "_Contidos"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Preferencias"
+
+#~ msgid "_Quit"
+#~ msgstr "_Saír"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Enviar unha _mensaxe..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Enviar mensaxe"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Es_tado"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Grupos de charla"
+
+#~ msgid "Enable"
+#~ msgstr "Activar"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modificar a conta..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Host errado"
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "A biblioteca GTK+ precisa un soporte de libglade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Por favor, elimine a súa biblioteca GTK+ actual e instale a última "
+#~ "versión estábel desde %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Por favor, asegúrese de que GTK+ e PyGTK teñen un soporte libglade no seu "
+#~ "sistema."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "O Gajim precisa un PySQLite2 para funcionar"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "Mens_axe entrante:"
 
@@ -10434,10 +10665,6 @@ msgstr " recurso con prioridade "
 #~ msgid "Gajim account %s"
 #~ msgstr "Conta de Gajim %s"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Personalizado</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "ID de Jabber duplicada"
 
@@ -10517,9 +10744,6 @@ msgstr " recurso con prioridade "
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo e Xulieta</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Historias antigas"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquio"
 
@@ -10635,9 +10859,6 @@ msgstr " recurso con prioridade "
 #~ msgstr ""
 #~ "Cambiar a mensaxe de estado para reflectir a pista_musical en reprodución"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Amosar só na _listaxe de contactos"
-
 #~ msgid "The auto away status message"
 #~ msgstr "A mensaxe de estado de autoausencia"
 
@@ -10674,18 +10895,9 @@ msgstr " recurso con prioridade "
 #~ msgid "_Before time:"
 #~ msgstr "_Antes da hora:"
 
-#~ msgid "_Never"
-#~ msgstr "_Nunca"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Notificarmo"
-
 #~ msgid "_Player:"
 #~ msgstr "_Reprodutor:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Emerxer"
-
 #~ msgid "City:"
 #~ msgstr "Cidade:"
 
diff --git a/po/hr.po b/po/hr.po
index b946426b0..4ca80be1a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.12\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-10-31 20:49+0100\n"
 "Last-Translator: Adrian C. <anrxc@sysphere.org>\n"
 "Language-Team: Croatian\n"
@@ -20,59 +20,11 @@ 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/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klijent"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "_Grupni Razgovori..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Dodaj Kontakt..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Otkrivanje Usluga"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Izvrši Naredbu..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Izmjeni Račun"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Otvori Gmail Sandučić"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Osobni Događaji"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Novi Razgovor..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -82,23 +34,23 @@ msgstr ""
 "\n"
 "Molim pričekajte..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Molim odaberite jednu od opcija ispod:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 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/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Molim odaberite poslužitelj</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -106,57 +58,64 @@ msgstr ""
 "Dodaj ovaj certifikat na listu povjerljivih certifikata.\n"
 "SHA1 potpis certifikata:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anon_imna autentifikacija"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Spoji se kada pritisnem Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Čarobnjak za Stvaranje Računa"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Već imam račun koji želim _koristiti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Želim se _registrirati novi račun"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Ako je označeno, Gajim će pamtiti lozinku za ovaj račun"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Uredi..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ništa"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Snimi lo_zinku"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Postavi moj profil pri spajanju"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Koristi vlastito ime poslužitelja/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -164,147 +123,141 @@ msgstr ""
 "Morate imati račun kako bi se mogli spojiti\n"
 "na Jabber mrežu."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Napredno"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Ime poslužitelja:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Poslužitelj:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Ostalo</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Osobne informacije</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "Ure_di prema statusu"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Korisnički račun"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Modifikacija Korisničkog Računa"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Korisnički Račun"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Administratorski postupci"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonimna autentifikacija"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatsko ponovno spajanje kada je veza izgubljena"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Sp_oji se prilikom pokretanja Gajima"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "P_romijeni Lozinku"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Označite ovo kako bi se Gajim spajao na port 5223 gdje se od starijih "
-"poslužitelja očekuju SSL mogućnosti. Primjetite da Gajim koristi TLS "
-"enkripciju ukoliko to server podržava, te će sa ovom opcijom uključenom TLS "
-"biti onemogućen"
+"Označite ovo kako bi vas Gajim obavijestio prije slanja vaše lozinke preko "
+"nesigurne veze."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Odaberi _Ključ"
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Kliknite za promjenu lozinke korisničkog računa"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Kliknite da zatražite autorizaciju svih kontakata drugog računa"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Sp_oji se prilikom pokretanja Gajima"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Veza"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Izmjeni Osobne Informacije"
+#: ../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 "Ime:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Općenito"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Ime poslužitelja:"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -312,8 +265,11 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -321,16 +277,7 @@ msgstr ""
 "Ako je označeno, Gajim će slati \"keep-alive\" pakete kako bi održao "
 "konekciju i spriječio prekid veze."
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Ako je označeno, Gajim će spremiti lozinku u ~/.gajim/config sa 'čitaj' "
-"dozvolom samo za vas"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -338,8 +285,7 @@ msgstr ""
 "Ako je označeno, Gajim će se pri pokretanju automatski spojiti na jabber "
 "koristeći ovaj račun"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -348,47 +294,49 @@ 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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Informacije o vama, kako stoji na poslužitelju"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Prezime:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Spoji račune"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Niti jedan ključ nije odabran"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Ništa"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Osobne Informacije"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port:"
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_tet:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -398,22 +346,20 @@ msgstr ""
 "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/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet će biti automatski promijenjen prema vašem statusu."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Pre_imenuj"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Resur_s:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -426,199 +372,89 @@ msgstr ""
 "Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa "
 "najvišim prioritetom dobivat će obavijesti o događajima"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Snimi _lozinku (nesigurno)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Spremaj _povijest razgovora za sve kontakte"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Šalji keep-alive pakete"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Šalji _keep-alive pakete"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Sink_roniziraj status računa sa globalnim statusom"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Sinkroniziraj kontakte"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Koristi _SSL (zastarjelo)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Koristi proxy za prijenos datoteka"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Uredi prema statusu"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Ime:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "Ure_di prema statusu"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Korisnički Račun"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anonimna autentifikacija"
-
-#: ../data/glade/accounts_window.glade.h:13
-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."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Sp_oji se prilikom pokretanja Gajima"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Ime:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ako je označeno, Gajim će preuzeti lozinku od GPG agenta kao seahorse"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Prezime:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Spoji račune"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Pre_imenuj"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Šalji _keep-alive pakete"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Sinkroni_ziraj status računa sa globalnim statusom"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Sinkroniziraj kontakte"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Koristi G_PG Agent"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Koristi vlastit_o ime poslužitelja/port"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Koristi vlas_titi port:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Koristi proxy za prijenos datoteka"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Izmjeni Osobne Informacije..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Omogući"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Ime poslužitelja:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Uredi..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port: "
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Upozori prije korištenja nesigurne veze"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_koristi HTTP__PROXY varijablu okruženja"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Račun:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Dodaj Novi Kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -630,7 +466,7 @@ msgstr ""
 "protokola. Kliknite na gumb registracije za\n"
 "nastavak."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -638,410 +474,467 @@ msgstr ""
 "Morate biti spojeni na transport da bi ste mogli\n"
 "dodavati kontakte sa ovog protokola."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Grupa:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Nadimak:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "Re_gistracija"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Pojavila se greška:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Izaberite naredbu za izvršiti:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc Naredbe - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Provjeri još jednom"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Opis greške..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Pričekajte dok se odvija primanje liste naredbi..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Pričekajte dok se odvija slanje naredbe..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Molim pričekajte..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Ovaj jabber entitet ne izlaže nikakve naredbe."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Napredni Uređivač Postavki"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Izbriši MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Briše Poruku Dana"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Izmjeni Liste _Privatnosti..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Šalje poruku trenutno spojenim korisnicima na ovom poslužitelju"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Postavi MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Postavlja Poruku Dana (Message of the Day)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Prikaži _XML Konzolu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Osvježi MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Osvježava Poruku Dana"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Pošalji Poslužiteljsku Poruku..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr " otvaranje prozora/kartice sa tim kontaktom "
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Akcije</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Uvjeti</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Zvuci</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Napredne Akcije"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Napredno Upravljanje Obavijestima"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Svi statusi"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Odsutan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Zauzet "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Pokrenite naredbu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Jedan ili više posebnih statusa..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Spojen / Slobodan za Razgovor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Odsviraj zvuk"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Primanje Poruke \n"
-"Kontakt Odspojen \n"
-"Kontakt Promjeni Status \n"
-"Osvjetljavanje na Poruku Grupnog Razgovora \n"
-"Primanje Poruke Grupnog Razgovora \n"
-"Zahtjev za Prijenosom Datoteke \n"
-"Početak Prijenosa Datoteke \n"
-"Završen Prijenos Datoteke"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Onemogući automatsko otvaranje prozora razgovora"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Onemogući postojeći iskočni prozor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../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/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Onemogući prikazivanje događaja u listi kontakata"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Onemogući prikazivanje događaja u traci radne površine"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Obavijesti me sa iskočnim prozorom"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Otvori prozor za razgovor sa korisnikom"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "Prikaži događaj u _listi kontakata"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Prikaži događaj u traci radne površine"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "i ja "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kontakt(i)\n"
-"grupe\n"
-"svi"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "za"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Unos:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Ime članaka:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Posljednja izmjena:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Primljen novi unos"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Primili ste novi unos:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blokirani Kontakti"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Poruka:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Postavi Aktivnost"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Postavi aktivnost"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Poruka:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Raspoloženje:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Promijeni Password"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Ponovite unos za potvrdu:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Unesite novu lozinku:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Aktivnost:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Raspoloženje:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Predefinirane poruke:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Spremi kao Predefiniranu..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "_Grupni Razgovori"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Dodaj na Listu..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopiraj JID/Email Adresu"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiraj Lokaciju Linka"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Otvori Sastavljanje Emaila"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otvori Link u Pregledniku"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Započni Razgovor"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#. 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 "_Pošalji"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "Po_zovi"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Pozovi Prijatelje!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "MUC poslužitelj"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Molim odaberite MUC poslužitelj."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1049,188 +942,186 @@ msgstr ""
 "Započeti će te MUC razgovor.\n"
 "Odaberite kontakte koje želite pozvati"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "Traži njegov/njezin status"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Dodaj Posebnu _Obavijest..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Pridruži Open_PGP Ključ..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "I_zvrši Naredbu..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Uredi _Grupe..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Pozovi _Kontakte"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "Uklo_ni"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Postavi Prila_gođeni Status"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Pošalji Jednu _Poruku..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Pošalji _Datoteku..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Postavi Prilagođeni _Avatar..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Započni _Razgovor"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Uključi/Isključi End to End Enkripciju"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Uključi/Isključi Open_PGP Enkripciju"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Dodaj na Listu..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli njemu/njoj da vidi moj status"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Blokiraj"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabrani mu/joj da vidi moj status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Povijest razgovora"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignoriraj"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Uredi Kontakt"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Pretplata"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Odblokiraj"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Prestani Ignorirati"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Ispunite formular."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Konfiguracija Sobe"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Izmjeni Grupe"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESession</b> informacije)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Provjeri"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Mogućnosti"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Lista aktivnih, kompletiranih i zaustavljenih prijenosa datoteka"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Prekini transfer datoteke"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Prekini transfer odabrane datoteke"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Počist_i"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Prijenosi Datoteka"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Skriva prozor"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Ukloni prijenos datoteka sa liste"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1238,75 +1129,74 @@ msgstr ""
 "Ova akcija uklanja prijenos datoteke sa liste. Ako je prijenos aktivan, prvo "
 "se zaustavlja i onda uklanja"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Nastaviti"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Obavijesti me kada se završi prijenos datoteka"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Otvaranje Mape Sadržaja"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Stanka"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "lista prijenosa datoteka"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Boje Statusa (kartice)</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Red Korisnički račun\n"
-"Red Grupa\n"
-"Red Kontakt\n"
-"Baner Razgovora"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Korisnički račun"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Podebljano"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Pisanje"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Stil fonta:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Personalizacija Gajim Tema"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Otišao"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Grupa"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Ukošeno"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1314,7 +1204,7 @@ msgstr ""
 "MUC\n"
 "Poruke"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1322,109 +1212,73 @@ msgstr ""
 "MUC Usmjerene\n"
 "Poruke"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pauza"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Boj_a teksta:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Font Teksta:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Pozadina:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Promijeni _Nadimak..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Promijeni _Temu..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Podešavanje _Sobe..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Postavi Oznaku"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Uništi Sobu"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Upravljanje sobom"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimiziraj kod izlaza"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Akcije Prisutnih"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Pošalji _Datoteku"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Dodaj na Listu"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Zabrani"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Izbaci"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Član"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Vlasnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Pošalji Privatnu Poruku"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Glas"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Stvorite novi dopis"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Od"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Tema"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1435,25 +1289,19 @@ msgstr ""
 "Općenito izbjegavajte uklanjanja vezana uz kontakte sa kojima trenutno "
 "razgovarate."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Obriši"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Izvoz"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Upravitelj Zapisima"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1468,402 +1316,420 @@ msgstr ""
 "Koristite ovaj program za brisanje ili izvoz zapisa. Zapise izaberite u "
 "lijevom stupcu a bazu možete pretraživati u formi ispod."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Pretraži Bazu Podataka"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Unesi JID ili Kontaktovo ime\n"
-"Povijest Grupnih Razgovora\n"
-"Povijest Svih Razgovora"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Ime kontakta"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Grupni Razgovori"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Pretraga:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Pamti povijest razgovora"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Postavi knjižnu oznaku za sobu"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Pregled"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Pridružiti se Grupnom Razgovoru"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Nadimak:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Nedavno:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+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"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Pridruživanje"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Podešavanje Računa"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Automatsko spajanje"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Podešavanje Knjižnih Oznaka"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimiziraj kod Automatskog Ulaska"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Poslužitelj:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Konfiguracija PEP Servisa"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Postavi"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Karakteristike</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Postavke</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Podešavanje Proxy Profila"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Lo_zinka:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Proxy _Računalo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Proxy _Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Koristi HTTP prox_y"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Koristi proxy aut_entifikaciju"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Ime:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Vrsta:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Korisničko ime:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Dodaj kontakt na listu (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Postavi knjižnu oznaku za sobu (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Pregledaj povijest razgovora (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Promjeni predmet razgovora u sobi (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Promijeni nadimak (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Pozovi kontakte na razgovor (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Pošalji datoteku (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Prikaži popis emoticona (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Prikaži popis formata"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Prikaži izbornik naprednih mogućnosti (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Prikaži profil kontakta (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Pošalji"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Lozinka"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Napredni Uređivač Postavki</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikacije</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Akcije</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatski Status</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Izgled Razgovora</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Boja Razlomaka Razgovora</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Vizualne Obavijesti o Statusu</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Uvjeti</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Osobne</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Font</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail Mogućnosti</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Predefinirane Statusne Poruke</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<i>Privatnost</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Izgled Liste Kontakata</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Statusne Poruke</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Teme</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Srednje:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizualne Obavijesti</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Statusi svih razgovora\n"
-"Samo pisanje\n"
-"Onemogućeno"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Svi statusi"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Dozvoli slanje podataka o _OS-u"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Dozvoli slanje podataka o _OS-u"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Dozvoli zvuk kada sam _zauzet"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Odsutan"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Uvijek koristi OS/X predefinirane aplikacije"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Uvijek koristi OS/X predefinirane aplikacije"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Uvijek koristi OS/X predefinirane aplikacije"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Zatraži statusnu poruku kada se:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"Automatski prepoznaj kod svakog Gajima pokretanja\n"
-"Uvijek koristi predefinirane GNOME aplikacije\n"
-"Uvijek koristi predefinirane KDE aplikacije\n"
-"Uvijek koristi predefinirane Xfce aplikacije\n"
-"Osobno prilagođeno"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "Sp_oji se prilikom pokretanja Gajima"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Poruka:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Pri pokretanju provjeri ako je Gajim _zadani Jabber klijent"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Pisanje"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Postavi boje i font sučelja"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Poruka:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Ime kontakta"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Osobni"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
 msgstr ""
-"Odvojena lista sa odvojenim razgovorima\n"
-"Odvojena lista sa jednim prozorom za razgovore\n"
-"Jedan prozor za sve\n"
-"Odvojena lista sa razgovorima grupiranim po računu\n"
-"Odvojena lista sa razgovorima grupiranim po vrsti"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Onemogućeno"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Prikaži _aktivnost kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Prikaži dodatne email _detalje"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Prikaži _raspoloženje kontakata na listi"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Prikaži _glazbu kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Prikaži a_vatare kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Prikaži _raspoloženje kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne _poruke kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1873,7 +1739,7 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se prikazati u "
 "prozorima razgovora."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1883,7 +1749,7 @@ msgstr ""
 "sa kontaktom. Ovdje možete odrediti koji statusi razgovora će se slati "
 "drugoj osobi."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1891,11 +1757,11 @@ msgstr ""
 "Gajim će vas obavijestiti o kontaktima koji su se upravo odjavili sa malim "
 "prozorom u donjem desnom kutu ekrana"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Sakrij dugmad u prozoru razgovora."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1903,21 +1769,21 @@ msgstr ""
 "Ako je označeno, Gajim će dopustiti drugima da vide koji operativni sustav "
 "koristite"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Ako je označeno, Gajim će ujedno uključiti i informacije o pošiljatelju"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ako je označeno, Gajim će promjeniti status u Odsutan kad se računalo ne "
 "koristi."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1925,7 +1791,7 @@ msgstr ""
 "Ako je označeno, Gajim će promjeniti status u Nedostupan kad se računalo ne "
 "koristi još duže."
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1933,7 +1799,7 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1941,23 +1807,29 @@ msgstr ""
 "Ako je označeno, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "Ako je označeno, Gajim će prikazivati aktivnost kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr "Ako je označeno, Gajim će prikazivati raspoloženje kontakata na listi"
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Ako je označeno, Gajim će prikazivati raspoloženje kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ako je označeno, Gajim će prikazivati glazbu koju slušaju kontakti na listi"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1968,7 +1840,7 @@ msgstr ""
 "desnim klikom miša na polje za unos teksta, zadani jezik će se koristiti za "
 "dani kontakt ili grupni razgovor."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1978,7 +1850,7 @@ msgstr ""
 "vaše liste. Koristite sa oprezom, blokira sve poruke koje dolaze od ljudi "
 "van vaše liste kontakata"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -1988,7 +1860,7 @@ msgstr ""
 "da se kod E2E enkripcije druga strana mora složiti s time, inače poruke neće "
 "biti zapisane."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1996,7 +1868,7 @@ msgstr ""
 "Ako je označeno, Gajim će obavještavati o novim e-mail porukama primljenim "
 "preko GMail"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2005,7 +1877,7 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
 "(npr. kontakt sa MSN-a će imati msn statusne ikone)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2013,7 +1885,7 @@ msgstr ""
 "Ako je označeno, Gajim neće pitati za statusnu poruku. Koristit će se "
 "odabrana predefinirana poruka."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2021,79 +1893,102 @@ msgstr ""
 "Ako nije onemogućeno, Gajim će zamjeniti ascii smajliće poput ':)' sa "
 "ekvivalentnim animiranim ili statičnim grafičkim emotikonama"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Spremaj _kriptirane razgovore"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Na_pravi prozore sa razgovorom kompaktnim"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Izmje_ni..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Nikad\n"
-"Samo kod događaja na čekanju\n"
-"Uvijek"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Nikada"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Obavijesti"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavijesti me o kontaktima koji se _prijave"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavijesti me o kontaktima koji se _odjave"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Obavijesti me o tome"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Obavijesti o novoj _Gmail e-pošti"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nikad\n"
+"Samo kod događaja na čekanju\n"
+"Uvijek"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Osobni Događaji"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Dozvoli _zvukove"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
-"Prikaži u iskočnom prozoru\n"
-"Obavijesti me o njima\n"
-"Prikaži samo na listi korisnika"
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Iskoči ga"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Postavke"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Poslužitelj:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Prikaži samo u _listi kontakata"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Prikaži ikonu u traci radne površine:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Prijavim"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Odjavim"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2101,27 +1996,27 @@ msgstr ""
 "Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.) Ako je "
 "označeno, Gajim će prikazati samo čisti tekst poruke."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Sortiranje kontakata po statusu"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Statusne _ikone:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Izgled"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2133,7 +2028,7 @@ msgstr ""
 "$S će biti zamjenjen sa prijašnjom porukom$T će biti zamjenjen sa auto-away "
 "vremenskim ograničenjem"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2145,732 +2040,713 @@ msgstr ""
 "$S će biti zamjenjen sa prijašnjom porukom\n"
 "$T će biti zamjenjen sa auto-not-available vremenskim ograničenjem"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Različite _ikone za prijenose"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Definirano _sustavom"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Kod novih događaja:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Poruka Greške: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Nadimak:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Odsutan automatski nakon:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Preglednik:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Prikaži obavijesti o statusu razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Emotikoni:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Upravitelj datotekama:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Istakni pogrešno napisane riječi"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriraj događaje od kontakata koji nisu na listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoriraj bogati sadržaj u dolaznim porukama"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Pamti promjene statusa kontakata"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Mail klijent:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "_Nedostupan automatski nakon:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Vrati predefinirane boje"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Šalji obavijesti o statusu razgovora"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "_URL isticanje:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Ponašanje Prozora"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "na _listi"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minuta"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste Privatnosti:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Dodaj / Izmjeni pravilo</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Lista pravila</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista Privatnosti</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktivno za ovu sesiju"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktivno pri svakom pokretanju"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Svi"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Sve (uključujući pretplatu)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Odbij"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Lista Privatnosti"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "sve prema pretplati"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "sve u grupi"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ništa\n"
-"oboje\n"
-"od\n"
-"za"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Oboje"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Od"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "jedan"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "dva"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "da mi šalje poruke"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "da mi šalje upite"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "da mi prikaže status"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "da vidi moj status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresa</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Grad:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Tvrtka:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Zemlja:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Odjel:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Prezime:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Puno Ime</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../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/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Osobna Stranica:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Srednje:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Ime:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Nadimak:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Pozicija:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Uloga:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../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/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Ulica:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Dodatak:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "O meni"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Kliknite za postavljanje avatara"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Osobne Informacije"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Posao"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Što želite učiniti?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Ukloni račun sam_o iz Gajima"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Ukloni račun iz Gajima i sa po_služitelja"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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>netko@negdje.com</b> želi da <b>dodate</b> neke kontakte na vašu listu."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../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/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Razmjena Artikla Sa Liste Kontakata"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Uredu"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Dodaj _Kontakt..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Mogućnos_ti Poslužitelja"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Prijenosi _Datoteka"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Često Postavljana Pitanja (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Online Pomoć"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil, A_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Prikaži Samo _Aktivne Kontakte"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Prikaži _Prijenose"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Prikaži _Odspojene Kontakte"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Prikaži _Listu Kontakata"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Korisnički Računi"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Akcije"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Sadržaj"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_Česta pitanja"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Postavke"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Izlaz"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "_Slanje Jedne Poruke..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Prikaz"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../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/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Pretraga"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Dodaj kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Informacije"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Pretraga"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "K_reni"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registriraj na"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Od:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Odgovori na ovu poruku"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "P_ošalji"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Pošalji poruku i zatvori prozor"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Za:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Odgovor"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Pošalji i Zatvori"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Odobri"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Odbija autorizaciju kontaktu kako nebi mogao vidjeti kada ste spojeni"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Zahtjev za Pretplatom"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Odbij"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Označite račun sa kojim želite sinkronizirati"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sinkroniziraj : označi kontakte"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Onemogući Zvukove"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Pošalji Jednu _Poruku"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Prikaži Sve _Događaje na Čekanju"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Grupni Razgovor"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Pitaj:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Klijent:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Vrijeme kontakta:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Resurs:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Pretplata:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Sustav:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Komentar"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Podešeni avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Informacije Kontakta"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Više"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Korisnički Avatar:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Promet</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Unos</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Omogući"
+#: ../data/gui/xml_console_window.ui.h:4
+msgid "Hide IN stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:5
+msgid "Hide IQ stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Info/Upit"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IU"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Prisutnost"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Izmjeni Račun..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lokalni jid:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Osobno"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Resurs"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber klijent"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Otkaži potvrdu"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Servis je poslao neispravne podatke"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Servis je promjenio identifikator sesije."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Servis je odgovorio sa greškom."
 
@@ -2895,7 +2771,7 @@ msgstr "Cijeli broj"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Boja"
 
@@ -3033,84 +2909,84 @@ msgstr "Švedski"
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Jezik pravopisa"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Podcrtaj"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Precrtaj"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Očisti oblikovanje"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Zaista pošalji datoteku?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Nije na Listi Kontakata"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Ovaj kontakt ne podržava prijenosa datoteka."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "GPG ključ nije dodjeljen"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3118,50 +2994,50 @@ msgstr ""
 "Niti jedan GPG ključ nije dodjeljen ovom kontaktu. Nije moguće kriptirati "
 "poruke sa GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti sačuvana"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti sačuvana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "i autentičan"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3170,48 +3046,48 @@ msgstr ""
 "%(type)s enkripcija %(status)s aktivna %(authenticated)s.\n"
 "Vaš razgovor %(logged)s biti zapisan."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Pregovaranje o sesiji neuspješno"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Ova razgovor je kriptiran"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr "i biti ĆE sačuvana"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti sačuvana"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 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:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Ova poruka NIJE kriptirana"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 msgid "The following message was encrypted"
 msgstr "Ova poruka je kriptirana"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Upravo ste primili novu poruku od \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3219,15 +3095,15 @@ msgstr ""
 "Ako zatvorite ovu karticu, a imate povijest onemogućenu, ova poruka biti će "
 "izgubljena."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Pogreška Baze Podataka"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3236,110 +3112,120 @@ 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:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je trenutno %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "kreiram bazu zabilješki"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "kreiram bazu zabilješki"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim će se sad isključiti"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram %s direktorij"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Izmjeni informacije o statusu"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Promjeni status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Postavi tip i opis prisustva"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Spojen"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Produženo odsustvo"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Ne uznemiravaj"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Neumreženo - prekid veze"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Opis prisustva:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Status je promjenjen."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s u %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Niste se  pridružili grupnom razgovoru"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Grupni Razgovori"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Napustili ste sljedeći grupni razgovor:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Proslijedi nepročitane poruke"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su proslijeđene."
 
@@ -3437,9 +3323,9 @@ msgid ""
 msgstr "Lista (odvojena razmacima) redova (računa i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "predefinirano"
 
@@ -3730,11 +3616,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:228
+#: ../src/common/config.py:229
 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:229
+#: ../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."
@@ -3742,7 +3628,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:230
+#: ../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."
@@ -3750,7 +3636,7 @@ msgstr ""
 "Ako je Neaktivno, više nećete vidjeti statusnu poruku u razgovorima, kada "
 "kontakt promjeni svoj status i/ili statusnu poruku."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3764,29 +3650,29 @@ msgstr ""
 "prikazivati sve statusne poruke. Ako je \"in_and_out\" Gajim će prikazivati "
 "samo poruke tipa FOO je ušao/izašao u/iz sobe."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Boja pozadine kontakata u trenu prijave."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Boja pozadine kontakata u trenu odjave."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u programskoj traci."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3796,7 +3682,7 @@ msgstr ""
 "će bljeskati (pretpostavljeno ponašanje u većini Window Manager-a) kod novih "
 "događaja."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3807,7 +3693,7 @@ msgstr ""
 "u grupnim razgovorima."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3827,31 +3713,31 @@ msgstr ""
 "'pertype' - Svaki tip poruke (npr., razgovori i grupni razgovori) se šalje u "
 "vezani prozor."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Skriva dugmad u prozorima razgovora."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Skriva baner u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Skriva baner u prozoru razgovora dviju osoba"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Skriva listu učesnika u prozoru grupnog razgovora."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3859,15 +3745,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentacija kod korištenja nadimaka koji se uzastopno pojavljuju."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Glatko pomicanje kroz poruke u prozorima razgovora."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3875,11 +3761,11 @@ msgstr ""
 "Lista boja, odvojenih sa \":\", koje će biti korištene za bojanje nadimaka u "
 "grupnim razgovorima."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3887,7 +3773,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:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3895,7 +3781,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:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3903,7 +3789,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:259
+#: ../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 "
@@ -3914,7 +3800,7 @@ msgstr ""
 "prijavljeni sa negativnim prioritetom NEĆETE primati nikakve poruke sa vašeg "
 "poslužitelja."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3922,7 +3808,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će koristiti Gnome Keyring (ako je dostupan) da bi "
 "pohranio lozinke računa."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3930,7 +3816,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će koristiti KDE Wallet (ako je kwalletcli dostupan) "
 "da bi pohranio lozinke računa."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3938,7 +3824,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će prikazivati broj prisutnih i ukupnih kontakata u "
 "redovima za račune i grupe."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3946,7 +3832,7 @@ msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretiraj sve dolazne "
 "poruke kao da su izabrane vrste"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3954,7 +3840,7 @@ msgstr ""
 "Ako je Aktivno, Gajim će otklizati i izabrati izabrati kontakt koji vam je "
 "poslao posljednju poruku, ako prozor s razgovorom već nije otvoren."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3962,12 +3848,12 @@ msgstr ""
 "Ako je Aktivno, Gajim će pretvoriti frazu između $$ i $$ u sliku koristeći "
 "dvips i pretvoriti prije ubacivanja u prozor s razgovorom."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 "Vrijeme neaktivnosti potrebno da bi se prozor za promjenu statusa zatvorio."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3975,7 +3861,7 @@ msgstr ""
 "Maksimalan broj linija koje se ispisuju u razgovorima. Najstarije linije se "
 "čiste."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3983,11 +3869,11 @@ msgstr ""
 "Ako je Aktivno, prozori sa obavijestima notification-daemon-a će biti "
 "prikačeni uz ikonu u traci radne površine."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Izaberi interval između dvije provjere nezaposlenosti."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3995,7 +3881,7 @@ msgstr ""
 "Promjeni vrijednost za promjenu veličine latex formule koja se prikazuje. "
 "Veća je viša."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4003,7 +3889,7 @@ 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:272
+#: ../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!"
@@ -4011,13 +3897,13 @@ msgstr ""
 "Zatraži statusnu poruku odspojenih kontakata nakon spajanja na osobni račun. "
 "UPOZORENJE: To će uzrokovati mnogo poslanih zahtjeva!"
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 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:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4025,7 +3911,23 @@ msgstr ""
 "Kada prikazati red osobnih kontakata. Može biti \"always\", "
 "\"when_other_resource\" ili \"never\""
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4033,7 +3935,7 @@ msgstr ""
 "Prioritet će se automatski promjeniti ovistno o vašem statusu. Prioriteti su "
 "definirani u autopriority_* opcijama."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4042,39 +3944,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:295
+#: ../src/common/config.py:305
 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:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "Ako je Aktivno, Autorizacija kontakata će biti obavljena automatski."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 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:301
+#: ../src/common/config.py:311
 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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Omogući ESessions enkripciju za ovaj račun."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 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:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4082,30 +3984,37 @@ msgstr ""
 "Poredani popis (odjeljen razmakom) vrsta povezivanja za probati. Može "
 "sadržavati tls, ssl ili plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 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:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Prikaži dijalog sa upozorenjem prije slanja lozinke preko nezaštićene veze."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Popis ssl grešaka koje će se ignorirati, odjeljene razmakom."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Razmak poslan nakon neaktivnosti"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping poslan nakon neaktivnosti"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4114,11 +4023,11 @@ msgstr ""
 "spajanje."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4126,15 +4035,15 @@ 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:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtjev za potvrdom o primitku"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Šalji potvrde o primitku"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4142,11 +4051,16 @@ msgstr ""
 "Prilikom pregovaranja o kriptiranoj sesiji, treba li Gajim pretpostaviti da "
 "želite zapisati vaš razgovor?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Je li OpenPGP omogućen za ovog kontakta?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4154,101 +4068,101 @@ msgstr ""
 "Treba li Gajim automatski započeti kriptiranu sesiju sa ovim kontaktom, ako "
 "je to moguće?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik koji se koristi za provjeru pravopisa"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', ili 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' ili ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Vraćam se ubrzo"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Vraćam se za nekoliko minuta."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite mi poruku."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Radim"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Vani"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Vani uživam život."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Ne uznemiravaj."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4257,58 +4171,50 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži vaš "
 "nadimak."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će svirati kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitati modul idle"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Krivi domaćin"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Neispravna lokalna adresa? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registracijske informacije za transport %s nisu došle na vrijeme"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registracija uspijela"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registracija sa agentom %s je uspjela"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Registracija nije uspijela"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4316,39 +4222,39 @@ msgstr ""
 "Registracija sa agentom %(agent)s nije uspjela, uz poruku o grešci %(error)"
 "s: %(error_msg)s"
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Disk Write Error"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Račun %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Neispravan Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 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:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4358,7 +4264,7 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili obrisati (svi "
 "zapisi razgovora će biti izgubljeni)."
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljeni nadimak: %s "
@@ -4366,76 +4272,76 @@ msgstr "Nedozvoljeni nadimak: %s "
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Maksimalan broj korisnika za %s je dosegnut"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zabranjen vam je pristup grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Grupni razgovor %s ne postoji."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora je ograničeno."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Morate koristiti vaš registrirani nadimak u grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Soba je uništena"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se pridružiti ovoj sobi umjesto: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Želio bih te dodati na moju listu kontakata."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada smo pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Zahtjev za ukidanjem pretplate od %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada smo ukinuli pretplatu za %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4573,27 +4479,27 @@ msgstr "Korištenje ključa ne uključuje potpisivanje certifikata"
 msgid "Application verification failure"
 msgstr "Application verification failure"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 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:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *kriptirana* (Vidi :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4602,78 +4508,78 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Veza sa računom \"%s\" je izgubljena"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Ponovo se spojite ručno."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, 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:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Nepravilan odgovor"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nije moguća veza sa \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Provjerite svoju vezu ili pokušajte kasnije."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Odgovor poslužitelja: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Veza na proxy nije uspjela"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Neuspješno povezivanje na račun %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, 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:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4682,7 +4588,7 @@ msgstr ""
 "\n"
 "SSL Greška: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4691,24 +4597,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Provjerite vašu vezu ili pokušajte ponovno kasnije"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikacija sa \"%s\" nije uspjela"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 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:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom brisanja liste privatnosti"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4717,44 +4623,44 @@ 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslan kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Poslani kontakti:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Brisanje registracije nije uspijelo"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, 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:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Prijenosi"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Nije na Listi Kontakata"
 
@@ -4763,36 +4669,52 @@ msgstr "Nije na Listi Kontakata"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus trenutno nije ispravno pokrenut na ovom računalu"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, 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"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Nemoguće pročitati bazu podataka."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 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:63
+#: ../src/common/exceptions.py:67
 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."
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Sesijska sabirnica nije dostupna.\n"
+"Pokušajte pročitati http:/trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Sesijska sabirnica nije dostupna.\n"
 "Pokušajte pročitati http:/trac.gajim.org/wiki/GajimDBus"
@@ -4960,206 +4882,206 @@ msgstr "Kraj tjedna"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Neispravan znak u korisničkom imenu."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Potrebna je adresa poslužitelja."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Neispravan znak u imenu računala."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Neispravan znak u resursu."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Povezujem"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Odspojen"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Odspojen"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Ima greške"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Pretplata koju već imamo:Ništa"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za Pretplatu):Ništa"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Sudionici"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Sudionik"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Posjetitelj"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost Kontakta u Grupnom Razgvoru:Nikakva"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "obraća pažnju na razgovor"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "stanka pri pisanju poruke"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor za razgovor"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5167,22 +5089,22 @@ msgstr[0] "%d poruka na čekanju"
 msgstr[1] "%d poruke na čekanju"
 msgstr[2] "%d poruka na čekanju"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr "iz sobe %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr "od korisnika %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr "od %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5190,12 +5112,49 @@ 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:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Konfiguracija Sobe"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+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"
@@ -5205,17 +5164,74 @@ msgstr "Greška u izvršavanju \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s nije ispravna razina zapisnika (loglevel)"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Predefinirana Poruka"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "veličina: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "greška: nemogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migriram bazu zabilješki u indekse"
 
@@ -5852,19 +5868,19 @@ msgstr "Učim"
 msgid "Writing"
 msgstr "Pišem"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Nepoznat Izvođač"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Nepoznat Naslov"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Nepoznat Izvor"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5874,12 +5890,12 @@ msgstr ""
 "šalje <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5888,7 +5904,7 @@ msgstr ""
 "otkazan."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5958,24 +5974,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja usluge. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Onemogućeno"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Predefinirana Poruka"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Omogućeno"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Riječnik za jezik %s nije dostupan"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5985,213 +5997,213 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Prijaviti se odmah?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije upotrebljiv na ovom računalu"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 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:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na poslužitelj"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promjenu imena računa morate se odspojiti."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Ime Računa Već Upotrebljeno"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 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:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Neispravno ime računa"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Ime računa ne može biti prazno."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Ime računa ne može sadržavati razmake."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Preimenuj Račun"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za račun %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID mora biti forme \"korisnik@poslužitelj\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Osobni port mora biti broj porta."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Neuspješno dohvaćanje tajnih ključeva"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "OpenPGP tajni ključ nije dostupan."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite svoj OpenPGP ključ"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Takav račun nije dostupan"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napravit svoj račun prije izmjena osobnih informacija."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Niste spojeni na poslužitelj."
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš poslužitelj ne podržava Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 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:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "Za deaktivaciju računa morate biti odspojeni."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Račun Lokalno već postoji."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Izmjena %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registrirati se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Ban Lista"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Lista Članova"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Lista Vasnika"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Lista Administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Zabranjivanje..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6199,11 +6211,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Dodaja Člana..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6211,11 +6223,11 @@ msgstr ""
 "<b>Koga želite učiniti članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Dodavanje Vlasnika..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6223,11 +6235,11 @@ msgstr ""
 "<b>Koga želite učiniti vlasnikom?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Dodajem Administratora..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6235,7 +6247,7 @@ msgstr ""
 "<b>Koga želite učiniti administratorom?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6251,59 +6263,87 @@ 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:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje %s računa"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Emotikoni onemogućeni"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite svoju lozinku za račun %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Spremiti lozinku"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je spojen na poslužitelj"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Veza na proxy nije uspjela"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Å to želite učiniti?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Ukloni račun sam_o iz Gajima"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Predefinirano"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?ispis_statusa:Sve"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Samo ulasci i izlasci"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?ispis_statusa:Ništa"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Novi Grupni Razgovor"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Ova knjižna oznaka ima neispravne podatke"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6311,27 +6351,27 @@ msgstr ""
 "oznaku."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Znak nije dozvoljen"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Neispravan poslužitelj"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Neispravna soba"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Račun je uspješno dodan"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6340,32 +6380,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:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi račun je uspješno stvoren"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Morate ponuditi korisničko ime za postavke ovog računa."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo specificirajte poslužitelj na koji se želite registrirati."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Certifikat je već na listi"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6380,7 +6420,7 @@ msgstr ""
 "SSL Greška: %(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6391,59 +6431,59 @@ msgstr ""
 "SHA1 otisak certifikata:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri stvaranju računa"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Ime računa se već koristi"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Već imate račun pod tim imenom."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Prva Poruka Primljena"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Sljedeća Poruka Primljena sa Fokusom"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Sljedeća Poruka Primljena bez Fokusa"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt Spojen"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt Odspojen"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Poruka Poslana"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Označavanje Poruke Grupnog Razgovora"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Grupnog Razgovora"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Primljen Gmail Email"
 
@@ -6465,44 +6505,44 @@ msgstr ""
 "Tekst niže od ove linije je ono što je rečeno od kad ste\n"
 "zadnji puta obraćali pozornost na ovaj grupni razovor"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Wikipedii"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Potražiti u _Riječniku"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Web Pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Pretraži Web"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Otvori kao _Poveznicu"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6511,7 +6551,7 @@ msgstr[1] "Jučer"
 msgstr[2] "Jučer"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -6615,68 +6655,68 @@ msgstr "Yahoo! Adresa:"
 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:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Molim ispunite podatke kontakta kojeg želite dodati"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Neispravan Korisnički ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne smije sadržavati resurs."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Nemoguće dodati samog sebe na vlastitu listu."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakt je već na listi"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Ovaj kontakt je već na vašoj listi kontakata."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ID Korisnika:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klijent"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ Verzija:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK Verzija:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Trenutni Razvojni Programeri:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Prošli Razvojni Programeri:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "ZAHVALE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Adrian C. <anrxc@sysphere.org>\n"
@@ -6684,7 +6724,7 @@ msgstr ""
 "Armando V. <synan@rilinux.hr>\n"
 "Vedran M. <rivanvx@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6696,100 +6736,100 @@ msgstr ""
 "pravopisa, ili odaberite drugi jezik postavkom odabira speller_language "
 "opcije."
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Nadimak sadrži nedozvoljene znakove."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtjev za pretplatom od %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružiti se Grupnom Razgovoru sa računom %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Neispravan Račun"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Neispravan Nadimak"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Jabber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Jabber ID grupnog razgovora ima nedozvoljene znakove."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze nije moguća sinkronizirati vaše kontakte."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Poslužitelj"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Ovaj račun nije spojen sa poslužiteljem"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Sinkroniziraj"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započeti Razgovor sa računom %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Započeti Razgovor"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6798,173 +6838,171 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molim potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Neispravan JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće učitati \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promjena lozinke."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Morate unesti lozinku."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Lozinke se ne podudaraju"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakt Se Prijavio"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt Se Odjavio"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nova Jedna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Novi E-mail"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Greška u Razmjeni Datoteka"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Razmjena Datoteka Završena"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Razmjena Datoteka Zaustavljena"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Poziv na Grupni Razgovor"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakt Promjenio Status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Jedna Poruka koristeći račun %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Jedna Poruka u računu %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Jedna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Poslati %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Konzola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Tužan"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Uredi"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "Uklo_ni"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6972,153 +7010,153 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Dodaj"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Uredi"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Obriši"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupe"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Dodaj kontakt"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista Privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista Privatnosti za %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosljed: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmjena pravila</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste Privatnosti za %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Liste Privatnosti"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Neispravno Ime Liste"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate unesti ime za stvaranje liste privatnosti."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste na grupni razgovor"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact vas je pozvao da se uključite u raspravu."
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Želite li prihvatiti poziv?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Odabir Zvuka"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Zvuci"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Odabir Slike"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje Posebne Obavijesti za %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Uvjet"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7129,19 +7167,19 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Kontaktov identitet potvrđen"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Potvrdi ponovno..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7151,19 +7189,19 @@ msgstr ""
 "ili slati vama poruke, morate potvrditi njihov identitet klikom na dugme "
 "ispod."
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktov identitet NIJE potvrđen"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Jeste li potvrdili kontaktov identitet?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7178,22 +7216,22 @@ msgstr ""
 "\n"
 "Short Authentication String ove sesije je <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 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:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ovaj kontakt nema dodijeljeni GPG ključ. Nije moguće kriptirati poruke."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7202,7 +7240,7 @@ msgstr ""
 "ključu</b>, tako da poruke <b>nemogu</b> biti kriptirane. Promjenite razinu "
 "povjerenja u njegov ključ sa GPG klijentom."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7210,52 +7248,52 @@ msgstr ""
 "GPG ključ je dodijeljen ovom kontaktu, i vi vjerujete njegovom ključu, tako "
 "da će poruke biti kriptirane."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Ostali"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Ukoliko niste spojeni nećete moći pregledati dostupne usluge"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje Usluga koristeći račun %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Usluga nije pronađena"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7263,95 +7301,99 @@ msgstr ""
 "Na adresi koju ste naveli nema usluge ili odgovora. Provjerite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Uslugu nije moguće pretražiti"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Neispravno Ime Poslužitelja"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pregled %(address)s koristeći račun %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži stvari za pretraživanje"
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Izvrši Naredbu..."
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Postavi Oznaku"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Knjižna oznaka je već postavljena"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, 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:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Knjižna oznaka je bez uspješno dodana"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Pretplaćeno"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Pretplatiti se"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Ukinuti pretplatu"
 
@@ -7403,7 +7445,7 @@ msgstr "Potreban je python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Mogućnost nije dostupna za Windows."
 
@@ -7568,102 +7610,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Potreban je python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Baneri i poveznice koje reagiraju na klik"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr "Mogućnost pretvaranja natpisa u zaglavljima prozora u URL linkove."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Potreban je python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Potreban je python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Funkcija"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Vrijeme"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošiljatelj: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Primatelj: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Spremljeno u: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Prijenos datoteka završen"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Otvaranje Mape Sadržaja"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Prijenos datoteka otkazan"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primatelj: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka Greške: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Razmjena datoteka zaustavljena"
 
@@ -7671,7 +7701,7 @@ msgstr "Razmjena datoteka zaustavljena"
 msgid "Choose File to Send..."
 msgstr "Odabir Datoteke za Slanje..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Opis: "
 
@@ -7703,33 +7733,33 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:860
+#: ../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 "Datoteka sa ovim imenom već postoji i nemate ovlasti prepisati ju."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, 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:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate ovlasti stvarati datoteke u ovom direktoriju"
 
@@ -7765,71 +7795,56 @@ msgstr "Datoteka: "
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati prazne datoteke"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Pošiljatelj: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Nastaviti"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim treba X poslužitelj za rad. Izlaz..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "Učitavanje PyGTK nije uspjelo: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim treba PyGTK 2.12 ili viši"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim treba PyGTK 2.12 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim treba GTK 2.12 ili viši"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim treba GTK 2.12 ili viši za pokretanje. Izlaz..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ nema podršku za libglade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Molim uklonite svoj trenutni GTK+ i instalirajte posljednju stabilnu verziju "
-"sa %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Molim provjerite da GTK+ i PyGTK imaju podršku za libglade na vašem sustavu"
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim treba PySQLite2 za pokretanje"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7839,11 +7854,11 @@ msgstr ""
 "na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7886,8 +7901,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "račun"
 
@@ -7909,14 +7924,17 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "jedno od: odspojen, povezan, razgovor, odsutan, produženo nedostupan, ne "
 "uznemiravaj, nevidljiv"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "poruka"
 
@@ -8147,70 +8165,89 @@ msgstr ""
 "na sve račune"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Rukuj xmpp:/ adresama"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI za obraditi"
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Sadržaj poruke"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Pridruživanje Novoj Sobi"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID Sobe"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Nadimak koji će se koristiti"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Lozinka za ulaz u sobu"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Provjerite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8219,15 +8256,15 @@ msgstr ""
 "'%s' nije na vašoj listi.\n"
 "Molim odredite račun za slanje poruke."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim nije pokrenut. Nije moguće koristiti gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8236,16 +8273,16 @@ msgstr ""
 "Uporaba: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8254,7 +8291,7 @@ msgstr ""
 "Uporaba: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8263,7 +8300,7 @@ msgstr ""
 "Previše argumenata. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8272,7 +8309,11 @@ msgstr ""
 "Argument \"%(arg)s\" nije određen. \n"
 "Unesite \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Krivi uri"
 
@@ -8301,176 +8342,177 @@ msgstr "Ne možete izbrisati svoju trenutnu temu"
 msgid "Please first choose another for your current theme."
 msgstr "Molim prvo odaberite neku drugu temu za trenutnu."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Slanje privatne poruke neuspješno"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Umetni _Nadimak"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Razgovor sa"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svakom sudioniku je sada dopušteno da vidi vaš puni JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Zapisivanje razgovora u sobi je omogućeno"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Nova soba je stvorena"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranjen pristup: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "pripadnost promjenjena"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe promjenjena na members-only"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "zaustavljanje sustava"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s je napustio"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 je trenutno %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Ne pitaj me više"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Mijenjanje Teme"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Molim specificirajte novu temu:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Mijenjam Nadimak"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molim specificirajte novi nadimak ako ga želite koristiti:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8478,22 +8520,22 @@ msgstr ""
 "Definitivno će te uništiti ovu sobu.\n"
 "Ispod možete navesti razlog:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Također možete unjeti alternativno mjesto sastanka:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Možete specificirati razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem pristup %s"
@@ -8513,59 +8555,59 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Prijavi Grešku"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detalji"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije zadani Jabber klijent"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Želite li postaviti Gajim za zadani Jabber klijent?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Produžetak nije podržan"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Snimiti Sliku kao..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8576,58 +8618,58 @@ msgstr ""
 "registriran od strane drugog učesnika.\n"
 "Molimo unesite drugi nadimak ispod:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "U slučaju konflikta uvijek koristi ovaj nadimak"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Prihvaćate li ovaj zahtjev?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvaćate li ovaj zahtjev na računu %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Veza Prekinuta"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Zahtjev za pretplatom"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontankt \"%s\" je uklonio pretplatu od vas"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8635,60 +8677,60 @@ 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Pretplata uklonjena"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" ne može biti uspostavljen"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, 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:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Soba od sada prikazuje nedostupne članove"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "Soba od sada ne prikazuje nedostupne članove"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Zapisivanje razgovora u sobi je sada omogućeno"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Zapisivanje razgovora u sobi je sada onemogućeno"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Soba je sada non-anonymous"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada semi-anonymous"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Soba je sada fully-anonymous"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
@@ -8696,23 +8738,23 @@ msgstr ""
 "Postavili ste Gajim da koristi GPG agent, ali GPG agent nije pokrenut ili je "
 "odgovorio sa krivom lozinkom.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste spojeni bez OpenPGP ključa."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije točna"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Netočna OpenGPG Lozinka"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG nije pouzdan"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8720,20 +8762,21 @@ msgstr ""
 "GPG ključ koji se koristi za kriptiranje ovog razgovora nije pouzdan. Zaista "
 "želite kriptirati ovu poruku?"
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi E-mail na %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8741,7 +8784,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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8756,42 +8799,42 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Druga strana je prekinula prijenos"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Greška pri čitanju datoteke"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prijenos %(filename)s %(name)s je zaustavljen. "
 
-#: ../src/gui_interface.py:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8800,56 +8843,57 @@ msgstr ""
 "Nemoguće dekriptirati poruke od %s\n"
 "Možda ih je netko izmjenio."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Nemoguće dekriptirati poruku"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Konflikt Resursa"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Već ste spojeni na ovaj račun sa istim resursom. Molim unesite novi."
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtjev Razmjene Datoteka"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Greška kod ovjere SSL certifikata"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8860,15 +8904,15 @@ msgstr ""
 "(error)s\n"
 "Još uvijek se želite povezati na ovaj poslužitelj?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriraj ovu grešku za ovaj certifikat."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Greška SSL certifikata"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8885,23 +8929,27 @@ msgstr ""
 "\n"
 "Još uvijek se želite povezati i korigirati otisak certifikata?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Nesigurna Veza"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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 nekriptirane veze. Jeste li sigurni "
-"da želite nastaviti?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, stvarno želim nesigurno povezivanje"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -8909,27 +8957,36 @@ 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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Spremate se poslati vašu lozinku preko nekriptirane veze. Jeste li sigurni "
+"da želite nastaviti?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije obrisan"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP čvor %(node)s nije obrisan: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Emotikoni onemogućeni"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 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:2570
+#: ../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 "
@@ -8939,40 +8996,40 @@ msgstr ""
 "format emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/"
 "Emoticons za više detalja."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće spremanje vaših postavki"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Potrebna Lozinka"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite GPG lozinku za ključ %(keyid)s (račun %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG ključ istekao"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vaš GPG ključ je istekao, biti će te spojeni na %s bez OpenPGP-a."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Kriva Lozinka"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
 
@@ -8980,37 +9037,37 @@ msgstr "Molim ponovo utipkajte svoju GPG lozinku ili pritisnite Odustani"
 msgid "_New Group Chat"
 msgstr "_Novi Grupni Razgovor"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Želio bih vas dodati na svoju listu kontakata"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći bazu podataka zapisa"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontakti"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9018,7 +9075,7 @@ msgstr ""
 "Želite li očistiti bazu podataka? (NE PREPORUČUJEMO UKOLIKO JE GAJIM "
 "POKRENUT)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9032,27 +9089,27 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, pričekajte..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Izvozim Zapise..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Ovo je nepovratna operacija."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9092,35 +9149,35 @@ msgstr "Stauts je trenutno: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Vrijeme isteklo kod učitavanja slike"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Zatvorit će te nekoliko kartica"
 
-#: ../src/message_window.py:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Grupni Razgovori"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Privanti Razgovori"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Poruke"
 
@@ -9132,22 +9189,22 @@ msgstr "- poruke će biti zapisane"
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti zapisane"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je Promjenio Status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Se Prijavio"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Se Odjavio"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Jedna Poruka od %(nickname)s"
@@ -9172,7 +9229,7 @@ msgstr "Nova poruka od %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignoriraj"
 
@@ -9180,18 +9237,18 @@ msgstr "Ignoriraj"
 msgid "Retrieving profile..."
 msgstr "Dohvaćam profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Nemogu učitati sliku"
 
@@ -9223,51 +9280,51 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja vaših osobnih podataka, pokušajte "
 "ponovno kasnije."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Spojeni računi"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Odobrenje je poslano"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će \"%s\" znati vaš status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Zahtjev za pretplatom je poslan"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Odobrenje je uklonjeno"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Sada će vas \"%s\" uvijek vidjeti kao odspojenog."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, 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:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Sudjelujete u jednom ili više grupnih razovora"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9275,27 +9332,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "desinkroniziran"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Zaista zatvori Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Uvijek zatvori Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Prekini transfer datoteke"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Imte nepročitane poruke"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9303,16 +9371,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:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati prije uklanjanja ovog prijenosa."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Prijenos \"%s\" biti će uklonjen"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9320,11 +9388,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima koji "
 "koriste ovaj prijenos."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Prijenos će biti uklonjen"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9333,11 +9401,11 @@ msgstr ""
 "Više nećete biti u mogućnosti razmjenjivati poruka sa kontaktima ovih "
 "prijenosa: %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 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:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9346,56 +9414,56 @@ msgstr ""
 "primiti."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Preimenuj Kontakt"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Preimenuj Grupu"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Ukloni Grupu"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Dodjeli OpenPGP Ključ"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za dodavanje kontaktu"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, 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:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9404,11 +9472,11 @@ msgstr ""
 "će vas ta osoba uvijek vidjeti kao da ste odspojeni."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Želite li nastaviti?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9416,16 +9484,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa vaše liste kontakata"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9435,35 +9503,36 @@ 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:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 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:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Nema dostupnih računa"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Spremanje metakontakata nije podržano na vašem poslužitelju"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9471,13 +9540,13 @@ msgstr ""
 "Vaš poslužitelj ne podržava spremanje informacija metakontakata. Te "
 "informacije neće biti spremljene kod sljedećeg spajanja."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9487,11 +9556,11 @@ msgstr ""
 "oni se koriste kada ista osoba ima nekoliko Jabber računa ili računa "
 "prijenosa."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9499,12 +9568,12 @@ msgstr[0] "Želite li poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Želite li poslati ove datoteke kontaktu %s:"
 msgstr[2] "Želite li poslati ove datoteke kontaktu %s:"
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Poslati %s prema %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Učini %s i %s pseudokontaktima"
@@ -9514,126 +9583,130 @@ msgstr "Učini %s i %s pseudokontaktima"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "na %s račun"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje Knjižni_m Oznakama..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "računa %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "za račun %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Izmjena Statusne Poruke"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Objavi Glazbu"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Objavi Glazbu"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Postavi Usluge..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maksimiziraj Sve"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Pošalji _Grupnu Poruku"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Svim spojenim korisnicima"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Upravljanje Kontaktima"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Izmjeni _Grupe"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Pošalji Jednu Poruku"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Izvrši Naredbu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Upravljanje Prijenosom"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Izmjeni Prijenos"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maksimiziraj"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Ponovno spajanje"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Odspoji"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Upravitelj Zapisima"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Pridruži se Novom Grupnom Razgovoru"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Promijeni Statusnu Poruku..."
 
@@ -9664,13 +9737,13 @@ msgid "Confirm these session options"
 msgstr "Potvrdi ove sesijske postavke"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Druga strana želi dogovoriti sesiju sa ovim značajkama:\n"
 "\n"
@@ -9693,116 +9766,126 @@ msgstr ""
 "\n"
 "Nastavi sesiju?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Promijeni Statusnu Poruku..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "na _listi"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Sakrij ovaj izbornik"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr "[blokirano]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr "[minimizirano]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Zadnji status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Spojen"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Odspojen"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Glazba:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Obavijest"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Podizanje"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Nije početo"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Završeno"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?status prijenosa:Stanka"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Zaustavljeno"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Prenosim"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis nije još pružio detaljnije informacije"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9810,28 +9893,28 @@ msgstr ""
 "Ova usluga nije mogla odgovoriti sa detaljnim informacijama.\n"
 "Najvjerojatnije je zastarjela ili neispravna"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Vrijeme:Nepoznato"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pripadnost:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9839,7 +9922,7 @@ msgstr ""
 "Ovaj kontakt je zainteresiran za informacije o vašem prisutstvu, ali vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9847,31 +9930,385 @@ msgstr ""
 "Vi ste zainteresirani za informacije o prisustvu nekog kontakta, ali nju/"
 "njega ne interesira vaše prisutstvo"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 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:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o vašem zahtjevu za pretplatom"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Niti jedan zahtjev za pretplatu nije u toku."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " resurs s prioritetom "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "_Grupni Razgovori..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Dodaj Kontakt..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Otkrivanje Usluga"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Izvrši Naredbu..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Izmjeni Račun"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Osobni Događaji"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Novi Razgovor..."
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Modifikacija Korisničkog Računa"
+
+#~ 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 ""
+#~ "Označite ovo kako bi se Gajim spajao na port 5223 gdje se od starijih "
+#~ "poslužitelja očekuju SSL mogućnosti. Primjetite da Gajim koristi TLS "
+#~ "enkripciju ukoliko to server podržava, te će sa ovom opcijom uključenom "
+#~ "TLS biti onemogućen"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Izmjeni Osobne Informacije"
+
+#~ msgid "Hostname: "
+#~ msgstr "Ime poslužitelja:"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Ako je označeno, Gajim će spremiti lozinku u ~/.gajim/config sa 'čitaj' "
+#~ "dozvolom samo za vas"
+
+#~ msgid "Port: "
+#~ msgstr "Port:"
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Snimi _lozinku (nesigurno)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Šalji keep-alive pakete"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Koristi _SSL (zastarjelo)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Uredi prema statusu"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Izbriši MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Pošalji Poslužiteljsku Poruku..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Primanje Poruke \n"
+#~ "Kontakt Odspojen \n"
+#~ "Kontakt Promjeni Status \n"
+#~ "Osvjetljavanje na Poruku Grupnog Razgovora \n"
+#~ "Primanje Poruke Grupnog Razgovora \n"
+#~ "Zahtjev za Prijenosom Datoteke \n"
+#~ "Početak Prijenosa Datoteke \n"
+#~ "Završen Prijenos Datoteke"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontakt(i)\n"
+#~ "grupe\n"
+#~ "svi"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Grupni Razgovori"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopiraj JID/Email Adresu"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopiraj Lokaciju Linka"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Otvori Sastavljanje Emaila"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Otvori Link u Pregledniku"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Započni Razgovor"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Red Korisnički račun\n"
+#~ "Red Grupa\n"
+#~ "Red Kontakt\n"
+#~ "Baner Razgovora"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Promijeni _Nadimak..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Promijeni _Temu..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Podešavanje _Sobe..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Uništi Sobu"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Upravljanje sobom"
+
+#~ msgid "Send _File"
+#~ msgstr "Pošalji _Datoteku"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Dodaj na Listu"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Pošalji Privatnu Poruku"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Unesi JID ili Kontaktovo ime\n"
+#~ "Povijest Grupnih Razgovora\n"
+#~ "Povijest Svih Razgovora"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Podešavanje Računa"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Dodaj kontakt na listu (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Postavi knjižnu oznaku za sobu (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Pregledaj povijest razgovora (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Promjeni predmet razgovora u sobi (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Promijeni nadimak (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Pozovi kontakte na razgovor (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Pošalji datoteku (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Prikaži popis emoticona (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Prikaži popis formata"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Prikaži izbornik naprednih mogućnosti (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Prikaži profil kontakta (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Statusi svih razgovora\n"
+#~ "Samo pisanje\n"
+#~ "Onemogućeno"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Automatski prepoznaj kod svakog Gajima pokretanja\n"
+#~ "Uvijek koristi predefinirane GNOME aplikacije\n"
+#~ "Uvijek koristi predefinirane KDE aplikacije\n"
+#~ "Uvijek koristi predefinirane Xfce aplikacije\n"
+#~ "Osobno prilagođeno"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Odvojena lista sa odvojenim razgovorima\n"
+#~ "Odvojena lista sa jednim prozorom za razgovore\n"
+#~ "Jedan prozor za sve\n"
+#~ "Odvojena lista sa razgovorima grupiranim po računu\n"
+#~ "Odvojena lista sa razgovorima grupiranim po vrsti"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Prikaži u iskočnom prozoru\n"
+#~ "Obavijesti me o njima\n"
+#~ "Prikaži samo na listi korisnika"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ništa\n"
+#~ "oboje\n"
+#~ "od\n"
+#~ "za"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Dodaj _Kontakt..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Mogućnos_ti Poslužitelja"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Prijenosi _Datoteka"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil, A_vatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Korisnički Računi"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sadržaj"
+
+#~ msgid "_FAQ"
+#~ msgstr "_Česta pitanja"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Postavke"
+
+#~ msgid "_Quit"
+#~ msgstr "_Izlaz"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Slanje Jedne Poruke..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Pošalji Jednu _Poruku"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Grupni Razgovor"
+
+#~ msgid "Enable"
+#~ msgstr "Omogući"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Izmjeni Račun..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Krivi domaćin"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Neispravna lokalna adresa? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Baneri i poveznice koje reagiraju na klik"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr "Mogućnost pretvaranja natpisa u zaglavljima prozora u URL linkove."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Potreban je python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ nema podršku za libglade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Molim uklonite svoj trenutni GTK+ i instalirajte posljednju stabilnu "
+#~ "verziju sa %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Molim provjerite da GTK+ i PyGTK imaju podršku za libglade na vašem "
+#~ "sustavu"
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim treba PySQLite2 za pokretanje"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Dolazna poruka:"
 
@@ -10090,12 +10527,6 @@ msgstr " resurs s prioritetom "
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim račun %s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Uvijek koristi OS/X predefinirane aplikacije"
-
-#~ msgid "Custom"
-#~ msgstr "Osobni"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Dvostruki Jabber ID"
 
@@ -10313,9 +10744,6 @@ msgstr " resurs s prioritetom "
 #~ msgstr ""
 #~ "Postavi statusnu poruku da odražava trenutno svirajuću _glazbenu traku"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Prikaži samo u _listi kontakata"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Statusna poruka automatske odsutnosti"
 
@@ -10349,18 +10777,9 @@ msgstr " resurs s prioritetom "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Napredno Upravljanje Obavijestima..."
 
-#~ msgid "_Never"
-#~ msgstr "_Nikada"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Obavijesti me o tome"
-
 #~ msgid "_Player:"
 #~ msgstr "_Player:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Iskoči ga"
-
 #~ msgid "City:"
 #~ msgstr "Mjesto:"
 
diff --git a/po/it.po b/po/it.po
index f8c654884..46f8c4ac6 100644
--- a/po/it.po
+++ b/po/it.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-08-19 23:53+0200\n"
 "Last-Translator: neoex <neoex.dc@gmail.com>\n"
 "Language-Team: Italian <>\n"
@@ -19,60 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Un client Jabber GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Entra in chat di _gruppo..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Aggiungi Contatto..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Ricerca servizi"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Esegui comando..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Modifica account"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Apri posta ricevuta"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Informazioni personali"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Inizia chat..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Stato"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -82,82 +33,89 @@ msgstr ""
 "\n"
 "Attendere prego..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Scegliere una delle seguenti opzioni:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Inserire i dati per il nuovo account</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Selezionare un server</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Usa autenticazione"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Connettiti alla pressione di Fine"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente creazione account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Ho già un account da usare"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Voglio _registrare un nuovo account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Se marcato, Gajim ricorderà la password per questo account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Gestisci..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Nessuno"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Ricorda la pass_word"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Configura il mio profilo appena effettuata la connessione"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Usa hostname/porta personalizzati"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -165,147 +123,144 @@ msgstr ""
 "È necessario avere un account per connettersi\n"
 "alla rete Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Avanzato"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Fine"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "Nome dell'_host: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Varie</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informazioni personali</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Privacy</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "_Modifica lo stato"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Account"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Modifica account"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Account"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Operazioni amministrative"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Usa autenticazione"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Riconnetti automaticamente quando si perde la connessione"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnetti all'avvio di Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "_Cambia password"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Se marcato, Gajim si connetterà alla porta 5223, sulla quale i server più "
-"vecchi attivano SSL. Notare che Gajim usa la cifratura TLS di default se il "
-"server la annuncia, e abilitando questa opzione TLS sarà disabilitata"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Scegli _chiave..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Clicca per cambiare la password dell'account"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Clicca per richiedere l'autorizzazione a tutti i contatti di un altro account"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "C_onnetti all'avvio di Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Connessione"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Modifica informazioni personali..."
+#: ../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 "Nome:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Generale"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Nome dell'host: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -314,8 +269,12 @@ msgstr ""
 "su cui viene eseguito, di modo che il trasferimento file abbia maggiori "
 "possibilità di funzionare correttamente."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, 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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -323,16 +282,7 @@ msgstr ""
 "Se marcato, Gajim invierà dei pacchetti di keep-alive per prevenire il "
 "timeout che provoca una disconnessione"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Se marcato, Gajim memorizzerà la password in ~/.gajim/config, con permessi "
-"di lettura solo per l'utente corrente"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -340,8 +290,7 @@ msgstr ""
 "Se marcato, Gajim, quando lanciato, si connetterà automaticamente a Jabber "
 "usando questo account"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -350,47 +299,49 @@ 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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Informazioni su di te, archiviate sul server"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 "ID Jabber: "
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Cognome:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Unisci account"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Nessuno"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Porta: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_tà:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -400,22 +351,20 @@ msgstr ""
 "server Jabber quando due o più client sono connessi usando lo stesso "
 "account; il client con la maggiore priorità riceverà gli eventi"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "La priorità cambierà automaticamente in funzione del tuo stato."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Ri_nomina"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "_Risorsa: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -429,211 +378,98 @@ msgstr ""
 "contemporaneamente. La risorsa con la priorità maggiore riceverà gli eventi. "
 "(vedi sotto)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Salva _passphrase (non sicuro)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "_Registra le conversazioni con tutti i contatti"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Invia pacchetti di keep-alive"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Sincronizza contatti"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Usa _SSL (vecchio)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Usa proxy per il trasferimento file"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Modifica lo stato"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Privacy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "_Modifica lo stato"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Account"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Usa autenticazione"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "C_onnetti all'avvio di Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Nome:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, 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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "ID Jabber: "
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Cognome:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Unisci account"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Ri_nomina"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Invia pacchetti di keep-alive"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Sinc_ronizza lo stato dell'account con lo stato globale"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Sincronizza contatti"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Usa hostname/porta personalizzati"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Usa porta personalizzata:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Usa proxy per il trasferimento file"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Modifica informazioni personali..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Abilita"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Nome dell'_host: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Gestisci..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Porta:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "A_ccount:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Aggiungi nuovo contatto"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -645,7 +481,7 @@ msgstr ""
 "protocollo. Premere il pulsante registra per\n"
 "procedere."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -653,415 +489,472 @@ msgstr ""
 "È necessario essere connesso al trasporto per poter aggiungere\n"
 " un contatto da questo protocollo."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Gruppo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Nickname:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protocollo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registra"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Si è verificato un errore:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Scegli il comando da eseguire:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Comandi ad-hoc - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Controlla ancora"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Descrizione errore..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Attendere durante il recupero della lista comandi..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Attendere durante l'invio del comando..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Attendere..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Questa entità Jabber non mostra alcun comando."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Descrizione</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Editor di configurazione avanzata"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Elimina MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Elimina il messaggio del giorno"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Modifica liste _privacy..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Invia un messaggio agli utenti attualmenti connessi a questo server"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Imposta MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Mostra console _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Aggiorna MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Aggiorna il messaggio del giorno"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Amministratore"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Invia messaggio server..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Azioni</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Condizioni</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Suoni</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Azioni avanzate"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Gestione avanzata delle notifiche"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Tutti gli stati"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Assente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Occupato "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Lancia un comando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Non disponibile"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Uno o più stati speciali..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Online / Libero per chat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Riproduci un suono"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Ricezione messaggio \n"
-"Contatto disconnesso \n"
-"Cambio di stato del contatto \n"
-"Messaggio di chat di gruppo evidenziato \n"
-"Messaggio di chat di gruppo ricevuto \n"
-"Richiesta di trasferimento file \n"
-"Trasferimento file iniziato \n"
-"Trasferimento file terminato"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Disabilita l'apertura automatica della finestra di chat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Disabilita la finestra di popup esistente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Disabilita il suono esistente associato all'evento"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Disabilita l'evento di apparizione nella lista contatti"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Disabilita la visualizzazione dell'evento nell'area di notifica"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informami con una finestra di popup"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Apri una finestra di chat con l'utente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "Mostra evento nella lista _contatti"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Mostra evento nell'area di notifica"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "ed io "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"contatto(i)\n"
-"gruppo(i)\n"
-"tutti"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "per "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Voce:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Nome feed:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Ultima modifica:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Nuova voce ricevuta"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Hai ricevuto un nuovo evento:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Contatti bloccati"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Messaggi di stato predefiniti</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Temi</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Suoni</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Cambia password"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Inserire nuovamente per conferma:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Inserire nuova password:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Attivato"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Stanza:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Messaggi predefiniti:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Salva come predefinito..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Entra in chat di _gruppo"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Aggiungi ai contatti..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Copia JID/indirizzo email"
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Copia indirizzo collegamento"
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Apri composizione email"
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Apri il collegamento nel browser"
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Inizia chat"
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#. 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 "_Invia"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "In_vita"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Invita amici!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "Server MUC"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Selezionare un server MUC."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1069,194 +962,192 @@ msgstr ""
 "Stai per iniziare una chat di gruppo.\n"
 "Scegli i contatti che vuoi invitare"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Aggiungi _notifica speciale..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Assegna chiave Open_PGP..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Esegui comando..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Modifica _gruppi..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "In_vita a "
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "_Gestisci contatti"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Elimina"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Invia s_tato personalizzato"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Invia _messaggio singolo..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Invia _file..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Imposta _avatar personalizzato..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Inizia _chat"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Attiva cifratura end-to-end"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Attiva cifratura Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Aggiungi ai contatti..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "Permetti di _vedere il mio stato"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Blocca"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Proibisci di vedere il mio stato"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Cronologia"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Gestisci contatto"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Rinomina..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Abbonamento"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Sblocca"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "nove"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Completa nel form."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configurazione della stanza"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Modifica gruppi"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Descrizione</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Servizi del server"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Annulla trasferimento file"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Annulla il trasferimento file selezionato"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "P_ulisci"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Trasferimenti file"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Nasconde la finestra"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Rimuove il trasferimento file dalla lista."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1264,76 +1155,75 @@ msgstr ""
 "Questa azione elimina un singolo trasferimento file dalla lista. Se il "
 "trasferimento è attivo, viene prima fermato e poi rimosso"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Continua"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifica quando un trasferimento file viene completato"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Apri cartella"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "lista trasferimenti file"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Colori della scheda di stato chat</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Account\n"
-"Gruppo\n"
-"Contatto\n"
-"Banner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Account"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Grassetto"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Scrivendo"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Contatto"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Stile carattere:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Personalizzazione temi di Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Andato via"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Gruppo"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inattivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Corsivo"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1341,7 +1231,7 @@ msgstr ""
 "Messaggi di una\n"
 "chat di gruppo"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1349,109 +1239,73 @@ msgstr ""
 "Messaggi inviati in\n"
 "una chat di gruppo"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "In pausa"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Colore del testo:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Carattere del _testo:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Sfondo:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Cambia _nickname..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Cambia _oggetto..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Configura la _stanza..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "Aggiungi _segnalibro"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Elimina stanza"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "Gestisci stanza"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimizza alla chiusura"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_deratore"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Azioni partecipante"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Invia _file"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Aggiungi ai contatti"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Amministratore"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Bandisci"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Caccia"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Proprietario"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Invia messaggio privato"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Voce"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Crea nuovo post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Da"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Oggetto"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1468,26 +1322,20 @@ msgstr ""
 "esecuzione. Generalmente evita di eliminare conversazioni dei contatti con "
 "cui stai chattando."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Elimina"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Esporta"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gestore cronologia di Gajim"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1496,419 +1344,436 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Cerca nel database"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Nome contatto"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Chat di gruppo"
+
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "Cerca"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr ""
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "C_onsulta"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Entra in chat di gruppo"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Nickname:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Password:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Recenti:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Aggiungi _segnalibro"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Gestisci account"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Partecipa automaticamente"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gestisci segnalibri"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimizza automaticamente"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Scrivi stato:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Configurazione della stanza"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Continua"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "gtk-close"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Proprietà</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Impostazioni</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr ""
 "Connessione HTTP\n"
 "SOCKS5"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gestisci profili proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Usa autenticazione"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "_URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Nome utente:"
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Aggiunge il contatto alla lista"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "sta seguendo la conversazione"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Clicca per inserire un emoticon (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Clicca per inserire un emoticon (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Clicca per inserire un emoticon (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Invia"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor di configurazione avanzata</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Applicazioni</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Azioni</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Azioni</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Aspetto della chat</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Colori della scheda di stato chat</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notifiche visuali</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Condizioni</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Suoni</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opzioni GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Messaggi di stato predefiniti</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Privacy</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Aspetto lista contatti</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Messaggi di stato predefiniti</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Temi</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Aggiungi una regola</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notifiche visuali</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Avanzato"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Tutti gli stati di chat\n"
-"Solo composizione\n"
-"Disattivato"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Tutti gli stati"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Consentire invio di informazioni sull'_OS"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Consentire invio di informazioni sull'_OS"
+
+#: ../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."
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Assente"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Chiedi messaggio di stato per:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"Rilevamento automatico ad ogni avvio di Gajim\n"
-"Usa sempre le applicazioni predefinite di GNOME\n"
-"Usa sempre le applicazioni predefinite di KDE\n"
-"Usa sempre le applicazioni predefinite Xfce\n"
-"Personalizzate"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "C_onnetti all'avvio di Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 #, fuzzy
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Verifica sempre se Gajim è il client Jabber _predefinito all'avvio"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Scrivendo"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Configura colore e tipo di carattere per l'interfaccia"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nome contatto"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Personalizzato</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Disabilitato"
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Mostra dettagli email _extra"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Mostra gli a_vatar dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Mostra i _messaggi di stato dei contatti nella lista contatti"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1918,7 +1783,7 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono visualizzare nella finestra di chat."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1928,7 +1793,7 @@ msgstr ""
 "conversazione con un contatto. Qui è possibile specificare che stati di chat "
 "si vogliono inviare al contatto."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1936,19 +1801,19 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si disconnette"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se marcato, Gajim entrerà in questa chat di gruppo all'avvio"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1956,19 +1821,19 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1976,7 +1841,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/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"
@@ -1984,7 +1849,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà il messaggio di stato di ogni membro di lista "
 "contatti e chat di gruppo sotto il suo nome"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1992,7 +1857,15 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2000,7 +1873,7 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2008,14 +1881,14 @@ msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella lista contatti e "
 "nelle chat di gruppo"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2026,14 +1899,14 @@ msgstr ""
 "spamma o disturba. Usare con cautela, poiché verranno bloccati tutti i "
 "messaggi ricevuti da chi non è membro della lista contatti."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2042,7 +1915,7 @@ msgstr ""
 "Se selezionato, Gajim includerà informazioni riguardo al mittente delle "
 "nuove email"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2052,13 +1925,13 @@ msgstr ""
 "(es. un contatto MSN avrà l'icona MSN equivalente per gli stati disponibile, "
 "assente, occupato, ecc...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2066,80 +1939,102 @@ msgstr ""
 "Se marcato, Gajim sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici animati o statici"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Rendi compatta la finestra dei _messaggi"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "_Gestisci..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Mai"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Demone delle notifiche"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Mostra notifica per i contatti che si _connettono"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Mostra notifica per i contatti che si _disconnettono"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notifica"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Notifica le nuove e-mail su _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Informazioni personali"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
-"Mostra immediatamente\n"
-"Mostra una notifica\n"
-"Mostra solo nella lista contatti"
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Mostra"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Preferenze"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Mostra solo nella lista _contatti"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "_Mostra evento nell'area di notifica"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2147,29 +2042,29 @@ msgstr ""
 "Alcuni messaggi potrebbero includere contenuto ricco (formattazione, colori, "
 "ecc.). Se selezionato, Gajim li mostrerà come messaggi semplici."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "_Ordina i contatti per stato"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Stato"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "_Icone di stato:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "In stallo"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2177,7 +2072,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2185,777 +2080,756 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Usa le icone dei _trasporti"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Usa il sistema _predefinito"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Quando si riceve un nuovo evento:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Messaggio di errore: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "_Prima del nickname:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "_Assente automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "Notifica dello stato di chat in _entrata:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Emoticon:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_File manager:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Evidenzia parole errate"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non appartenenti alla lista"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignora la formattazione dei messaggi ricevuti"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Client di posta:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "_Non disponibile automaticamente dopo:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Reimposta ai colori di default"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "Notifica dello stato di chat in usci_ta:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "Messaggio di _stato:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "Entra in chat di _gruppo"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "Non nei contatti"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minuti"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste privacy:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Aggiungi/modifica una regola</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Lista di regole</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista privacy</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Attiva per questa sessione"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Attiva ad ogni avvio di Gajim"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "a tutti"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "a tutti per abbonamento"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permetti"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Nega"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "ID Jabber"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Ordine:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Lista privacy"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "a tutti per abbonamento"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "a tutti nel gruppo"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"nessuno\n"
-"entrambi\n"
-"da\n"
-"a"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Entrambi"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Da"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "uno"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "due"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "di inviarmi messaggi"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "di inviarmi richieste"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "di inviarmi uno stato"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "di vedere il mio stato"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "Avatar:"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../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/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Suoni</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Dipartimento:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Mail:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Indirizzo extra:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Cognome:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "Nome completo"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Homepage:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Temi</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Nickname:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefono:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>Condizioni</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "Codice postale:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>Privacy</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Suoni</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Impostazioni</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Impostazioni</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suoni</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "A proposito"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Clicca per inserire l'avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Informazioni personali"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Cosa vuoi fare?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Rimuovi l'account solo da _Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Rimuovi l'account da Gajim e dal _server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Elimina"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "gtk-close"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Aggiungi _contatto......"
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Fun_zioni"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Trasferimenti file"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Domande frequenti (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Aiuto online"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profilo, a_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Mostra tras_porti"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Mostra lista _contatti"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Account"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Azioni"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Contenuti"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_Domande frequenti"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Preferenze"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Esci"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Invia _messaggio singolo..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Visualizza"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Attendere durante il recupero dei campi di ricerca..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Cerca"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Aggiungi contatto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Informazioni"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Cerca"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Vai"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registra a"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Da:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Rispondi a questo  messaggio"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Invia"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Invia messaggio"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Invia messaggio e chiudi la finestra"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "A:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Rispondi"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Invia e _chiudi"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Autorizza"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr ""
 "Nega l'autorizzazione al contatto cosicché non sappia quando sei connesso"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Richiesta di abbonamento"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Nega"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Seleziona l'account con cui vuoi effettuare la sincronizzazione"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sincronizzazione: scegli i contatti"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Disabilita suoni"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Invia _messaggio singolo"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Mostra tutti gli _eventi in attesa"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_to"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "Chat di _gruppo"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Azioni</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Impostazioni</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "ID Jabber: "
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Risorsa:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Impostazioni</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Descrizione</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Personalizzato</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Commenti"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Avatar personalizzato:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Contatto"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Informazioni sul contatto"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Ancora"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Avatar dell'utente:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Suoni</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Traffico Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Inserimento XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Abilita"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Info/Richiesta (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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Messaggio"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modifica account..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "JID locale:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Informazioni personali"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Risorsa:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Un client Jabber GTK+"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informazioni sul contatto"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 #, fuzzy
 msgid "Service changed the session identifier."
 msgstr "Il client a %s ha annullato la negoziazione della sessione."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -2980,7 +2854,7 @@ msgstr "Intero"
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Colore"
 
@@ -3117,134 +2991,134 @@ msgstr "Svedese"
 msgid "Chinese (Ch)"
 msgstr "Cinese (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Lingua per la correzione ortografica"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Nessuna connessione disponibile"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "Sottolinea"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Servizio"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "_Carattere:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informazioni sul contatto"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Cifratura attivata"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Non nei contatti"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Un elenco dei trasferimenti di file attivi, completati ed annullati"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usa autenticazione"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usa autenticazione"
@@ -3252,59 +3126,59 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Negoziazione della sessione annullata"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 #, fuzzy
 msgid " and WILL be logged"
 msgstr "La sessione SARÀ registrata"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 #, fuzzy
 msgid " and WILL NOT be logged"
 msgstr "La sessione NON SARÀ registrata"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Il seguente messaggio NON è stato cifrato"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3312,126 +3186,136 @@ msgstr ""
 "Se chiudi questa scheda e la cronologia è disabilitata, questo messaggio "
 "verrà perso."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 #, fuzzy
 msgid "Database Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s è ora %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "creazione database log"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "creazione database log"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Modifica le informazioni sullo stato"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Modifica lo stato"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Imposta tipo di presenza e descrizione"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Libero per chat"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Assente a lungo"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Non disturbare"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Offline - disconnetti"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Descrizione della presenza:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Stato modificato."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Esci dalle chat di gruppo"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s su %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Non si è entrati in una chat di gruppo."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Chat di gruppo"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Sei uscito dalle seguenti chat di gruppo:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Inoltra messaggi non letti"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Tutti i messaggi non letti sono stati inoltrati."
 
@@ -3528,9 +3412,9 @@ msgid ""
 msgstr "Lista (separata da spazi) di linee (account e gruppi) raggruppate."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "predefinito"
 
@@ -3810,11 +3694,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:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3822,7 +3706,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:230
+#: ../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."
@@ -3830,7 +3714,7 @@ msgstr ""
 "Se Falso, non si vedrà più la linea di stato nelle chat quando un contatto "
 "cambia stato o messaggio di stato."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3844,30 +3728,30 @@ msgstr ""
 "i messaggi di stato. Se \"in_and_out\", gajim scriverà solo quando qualcuno "
 "entra od esce dalla chat di gruppo."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Colore di sfondo dei contatti appena collegati."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Colore di sfondo dei contatti appena scollegati."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Non mostrare l'avatar per il trasporto stesso."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Non mostrare l'account nella taskbar del sistema."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3877,7 +3761,7 @@ msgstr ""
 "finestra lampeggia (comportamento predefinito per la maggior parte dei "
 "gestori di finestre) quando contiene nuovi eventi."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3888,7 +3772,7 @@ msgstr ""
 "SHA nella presenza sulle chat di gruppo"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3909,32 +3793,32 @@ msgstr ""
 "ad una specifica finestra. Nota, cambiare questa opzione richiede il riavvio "
 "di Gajim prima che le modifiche abbiano effetto"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Nascondi i pulsanti nella finestra di chat di gruppo."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Nasconde l'intestazione in una finestra di chat di gruppo"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Nasconde l'intestazione nella finestra di chat a due persone"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 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:251
+#: ../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."
@@ -3942,15 +3826,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentazione quando si raggruppano nickname consecutivi."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Scorrimento fluido dei messaggi nella finestra di continuazione"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3959,12 +3843,12 @@ msgstr ""
 "Lista di colori che saranno usati per colorare i nickname nelle chat di "
 "gruppo."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3972,7 +3856,7 @@ msgstr ""
 "Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
 "vuota significa che non verrà mai mostrata."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
@@ -3981,7 +3865,7 @@ msgstr ""
 "Mostrare la richiesta di conferma creazione metacontatti o meno? Una stringa "
 "vuota significa che non verrà mai mostrata."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
@@ -3990,7 +3874,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: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 "
@@ -4000,7 +3884,7 @@ msgstr ""
 "di modifica account. ATTENZIONE, quando si è collegati con priorità "
 "negativa, NON si riceveranno messaggi dal server."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -4008,7 +3892,7 @@ msgstr ""
 "Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
 "password degli account."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 #, fuzzy
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
@@ -4017,7 +3901,7 @@ msgstr ""
 "Se Vero, Gajim userà il Keyring Gnome (se disponibile) per memorizzare le "
 "password degli account."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -4025,7 +3909,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il numero di account online e totali nelle linee "
 "degli account e dei gruppi."
 
-#: ../src/common/config.py:263
+#: ../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"
@@ -4033,7 +3917,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:264
+#: ../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."
@@ -4041,7 +3925,7 @@ msgstr ""
 "Se Vero, Gajim scorrerà e selezionerà il contatto che ti ha mandato l'ultimo "
 "messaggio, se la finestra di chat non è già aperta."
 
-#: ../src/common/config.py:265
+#: ../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."
@@ -4049,13 +3933,13 @@ msgstr ""
 "Se Vero, Gajim converterà le stringhe comprese tra $$ e $$ in un'immagine "
 "usando dvips e convertendola prima di inserirla in una finestra di chat."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 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:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4063,45 +3947,61 @@ msgstr ""
 "Massimo numero di linee che sono visualizzate nelle conversazioni. Le linee "
 "più vecchie verranno cancellate."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4109,79 +4009,84 @@ msgstr ""
 "La priorità cambierà automaticamente rispetto al tuo stato. Le priorità sono "
 "definite nelle opzioni autopriority_*."
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, 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:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Workaround Jabberd2"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4189,15 +4094,15 @@ 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:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4205,111 +4110,116 @@ msgstr ""
 "Durante la negoziazione di una sessione cifrata, Gajim deve abilitare la "
 "registrazione dei messaggi?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP è abilitato per questo contatto?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Linguaggio per il quale controllare le parole sbagliate"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "tutto o stati separati da uno spazio"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', o 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' o 'both'"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Torno tra qualche minuto."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Sono al telefono."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Sono fuori a divertirmi."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Sono disponibile."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Solo libero per chat."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Torno subito."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Non sono disponibile."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Non disturbare."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Ciao ciao!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4317,108 +4227,100 @@ 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:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Suono da riprodurre quando un messaggio MUC arriva."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Impossibile caricare il modulo idle"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Host errato"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Indirizzo locale non valido? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Le informazioni di registrazione per il transport %s non sono arrivate in "
 "tempo"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "La vCard è stata pubblicata correttamente"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "Migrazione GUI fallita"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Errore di scrittura su disco"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname non permesso: %s"
@@ -4426,76 +4328,76 @@ msgstr "Nickname non permesso: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Sei stato bandito dalla stanza %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "La stanza %s non esiste."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Non è permessa la creazione di stanze."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Il tuo nickname è già in uso nella stanza di gruppo %s:"
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Non sei nella lista dei membri nella chat di gruppo %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "La stanza è stata cancellata"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Puoi invece entrare in questa stanza: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "si è ora abbonati a %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "è stato ora cancellato l'abbonamento a %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4636,28 +4538,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Questo messaggio è *cifrato* (vedi :JEP:`27`)]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4666,111 +4568,111 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Riconnetti manualmente."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Risposta non valida"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Connessione al proxy fallita"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Non è possibile connettersi a \"%s\""
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versione D-Bus sconosciuta: %s"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Verificare la correttezza di login e password."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Errore durante la rimozione della lista privacy"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4779,45 +4681,45 @@ msgstr ""
 "La lista privacy %s non è stata rimossa. Potrebbe essere attiva in una delle "
 "risorse connesse. Disattivarla e riprovare."
 
-#: ../src/common/connection.py:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Gestisci contatti"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Non ottenuto a causa di stato invisibile"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Migrazione GUI fallita"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Osservatori"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Trasporti"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Non nei contatti"
 
@@ -4826,43 +4728,59 @@ msgstr "Non nei contatti"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "La dipendenza pysqlite2 (o python-pysqlite2) è mancante. Uscita..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr ""
+"D-Bus non è presente su questa macchina o il relativo modulo python è "
+"mancante"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Servizio non disponibile: Gajim non è in esecuzione, o remote_control è "
 "Falso."
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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 è "
 "mancante"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Il bus di sessione non è disponibile.\n"
-"Provare a leggere http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr "Il bus di sessione non è disponibile."
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
+msgstr "Il bus di sessione non è disponibile."
 
 #: ../src/common/fuzzyclock.py:38
 msgid "twelve"
@@ -5027,240 +4945,277 @@ msgstr "Fine settimana"
 msgid "Weekend!"
 msgstr "Fine settimana!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Carattere non valido nel nome utente."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Indirizzo del server richiesto."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Carattere non valido nell'hostname."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Carattere non valido nella risorsa."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "O_ccupato"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Occupato"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Non disponibile"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Libero per chat"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Libero per chat"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Disponibile"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Disponibile"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Connessione in corso"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Assente"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Invisibile"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Ci sono errori"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "A"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Entrambi"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Nulla"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Abbonati"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Nessuno"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Partecipanti"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Visitatori"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Visitatore"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Nessuna"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Proprietario"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Amministratore"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "sta seguendo la conversazione"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "sta facendo altro"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "ha smesso di scrivere"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "ha chiuso la finestra o scheda di chat"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " dalla stanza %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " dall'utente %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " da %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, 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:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Configurazione della stanza"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5270,17 +5225,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr "%s non è un livello di log valido"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Messaggi di stato preimpostati"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Dimensione: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "errore: impossibile aprire %s per lettura"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "Migrazione database delle cronologie agli indici"
 
@@ -5992,22 +6004,22 @@ msgstr ""
 msgid "Writing"
 msgstr "Lavoro"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Tipo sconosciuto %s "
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6015,12 +6027,12 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -6029,7 +6041,7 @@ msgstr ""
 "file verrà annullato."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6100,26 +6112,22 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Errore durante la creazione del servizio. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Disabilitato"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Messaggi di stato preimpostati"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Abilita"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dizionario per lingua %s non disponibile"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6128,222 +6136,222 @@ msgstr ""
 "E' necessario installare il dizionario %s per usare il controllo "
 "ortografico, o configurare un'altra lingua nelle opzioni speller_language"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Effettuare un nuovo login?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Eventi non letti"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Leggere tutti gli eventi in attesa prima di rimuovere questo account."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Hai aperto una chat nell'account %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 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:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Rinomina account"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Inserisci un nuovo nome per l'account %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Scelta chiave OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Il server non supporta Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Il server non può salvare le informazioni personali."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Nome account già in uso"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Lista utenti bloccati"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Lista membri"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Lista proprietari"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Lista amministratori"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Nickname"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Ruolo"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Sto bloccando..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6351,11 +6359,11 @@ msgstr ""
 "<b>Chi si vuole bloccare?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Aggiunta membro..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6363,11 +6371,11 @@ msgstr ""
 "<b>Chi si vuole rendere membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Aggiunta proprietario..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6375,11 +6383,11 @@ msgstr ""
 "<b>Chi si vuole rendere proprietario?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Aggiunta amministratore..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6387,7 +6395,7 @@ msgstr ""
 "<b>Chi si vuole rendere amministratore?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6405,59 +6413,87 @@ msgstr ""
 "4. dominio (il dominio corrisponde, così come qualsiasi utente@dominio,\n"
 "dominio/risorsa, o indirizzo contenente un sottodominio)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Cifratura disattivata"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Connessione al proxy fallita"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Cosa fare?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Rimuovi l'account solo da _Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Predefinito"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Tutti"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Solo ingresso ed uscita"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "Nessuno"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Nuova chat di gruppo"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6465,29 +6501,29 @@ msgstr ""
 "segnalibro."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Nickname non valido"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Nickname non permesso: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Server non valido"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Voce non valida"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6498,33 +6534,33 @@ msgstr ""
 "\", o farlo più tardi scegliendo la voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Per favore fornire il server su cui vuoi registrarti."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6534,7 +6570,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6542,61 +6578,61 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Primo messaggio ricevuto"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Prossimo messaggio ricevuto"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Contatto connesso"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Contatto disconnesso"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Messaggio inviato"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Evidenziatura messaggi in chat di gruppo"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Messaggio ricevuto in chat di gruppo"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Email GMail ricevuta"
 
@@ -6616,45 +6652,45 @@ msgstr ""
 "Il testo sotto a questa riga è quanto è stato detto dall'ultima volta che si "
 "è prestata attenzione a questa chat di gruppo"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Esci"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Apri come _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6662,7 +6698,7 @@ msgstr[0] "Ieri"
 msgstr[1] "Ieri"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
@@ -6769,67 +6805,67 @@ msgstr "Indirizzo Yahoo!:"
 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "ID utente non valido"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "L'identificatore dell'utente deve non contenere una risorsa."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Contatto già presente nella lista contatti"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Questo contatto è già presente nella lista contatti."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Versione di GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Versione di PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Sviluppatori attuali:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Sviluppatori precedenti:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "GRAZIE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Mauro Brenna <malloblenne@gmail.com>\n"
@@ -6837,7 +6873,7 @@ msgstr ""
 "Matteo Dell'Amico <della@linux.it>\n"
 "Daniel Coppi <neoex.dc@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6850,276 +6886,274 @@ msgstr ""
 "\n"
 "L'evidenziazione delle parole errate non verrà usata"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Il nickname contiene caratteri non consentiti."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Si è già nella stanza %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Il nome account non è valido"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, 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:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nickname non valido"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, 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:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Il nome della stanza o del server contiene caratteri non permessi."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Questa non è una chat di gruppo"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, 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:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Senza una connessione, non puoi sincronizzare i tuoi contatti."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Questo account non è connesso al server"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Sincronizza"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 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:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "ID Jabber non valido"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossibile processare \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Nuova e-mail"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Invito a chat di gruppo"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Stato Contatto Cambiato"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Messaggio singolo nell'account %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Ricevuto %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "In stallo"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "_Modifica"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Elimina"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7127,157 +7161,157 @@ msgid ""
 msgstr "Vorrei aggiungerti alla mia lista contatti."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 #, fuzzy
 msgid "Add"
 msgstr "Indirizzo"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "_Modifica"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Elimina"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "ID Jabber: "
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Gruppo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Vorrei aggiungerti ai miei contatti."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Aggiungi contatto"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privacy <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordine: %s, azione: %s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Modifica una regola</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Aggiungi una regola</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privacy per %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Liste privacy"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Nome lista non valido"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "È necessario inserire una nome per creare una lista privacy"
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Non si è entrati in una chat di gruppo."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact ti ha invitato a partecipare a una discussione"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 #, fuzzy
 msgid "Do you want to accept the invitation?"
 msgstr "Vuoi inviare questo file a %s:"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s diventa:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Creazione notifica speciale per %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Condizione"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "quando io sono "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7285,39 +7319,39 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 #, fuzzy
 msgid "Have you verified the contact's identity?"
 msgstr "Verifica l'identità del client remoto"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7327,78 +7361,78 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Altri"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Conferenze"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Senza una connessione, non è possibile consultare i servizi disponibili"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Ricerca servizi usando l'account %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Ricerca servizi"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Il servizio non è stato trovato"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7406,96 +7440,100 @@ msgstr ""
 "Il servizio all'indirizzo immesso non risponde o è inesistente. Controllare "
 "l'indirizzo e riprovare."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Non è possibile consultare il servizio"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Server non valido"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Consulta %s usando l'account %s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "C_onsulta"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Esegui comando"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Descrizione"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "Aggiungi _segnalibro"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Segnalibro già impostato"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "La stanza \"%s\" è già tra i segnalibri."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Il segnalibro è stato aggiunto con successo"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Abbonati"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Nuovo post"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "Disa_bbonati"
 
@@ -7549,7 +7587,7 @@ msgstr "Richiede python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Caratteristica non disponibile sotto Windows."
 
@@ -7732,103 +7770,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Richiede python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-#, fuzzy
-msgid "Requires python-sexy."
-msgstr "Richiede python-dbus."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Richiede python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Funzione"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Tu"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Memorizzato in: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Apri cartella"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Trasferimento file annullato"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Destinatario: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Messaggio di errore: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Trasferimento file fermato"
@@ -7837,7 +7862,7 @@ msgstr "Trasferimento file fermato"
 msgid "Choose File to Send..."
 msgstr "Scegliere il file da inviare..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Descrizione: %s"
@@ -7870,12 +7895,12 @@ msgstr "Descrizione: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:860
+#: ../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."
@@ -7883,22 +7908,22 @@ msgstr ""
 "Un file con lo stesso nome è già presente e non si ha il permesso per "
 "sovrascriverlo"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Questo file esiste già"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "La cartella \"%s\" non è scrivibile."
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Non si ha il permesso di creare file in questa cartella."
 
@@ -7934,75 +7959,57 @@ msgstr "File: "
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Continua"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim ha bisogno di PyGTK 2.8 o superiore"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr ""
 "Gajim ha bisogno di PyGTK 2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim ha bisogno di GTK2.8 o superiore"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim ha bisogno di GTK2.8 o superiore per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Supporto libglade mancante nel runtime GTK+"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
-"da %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Verificare che GTK+ e PyGTK abbiano supporto libglade sul sistema."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim ha bisogno di pywin32 per essere eseguito"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8012,11 +8019,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim è già in esecuzione"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8057,8 +8064,8 @@ msgstr "Scrive la lista contatti. Ogni contatto appare su una linea separata"
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "account"
 
@@ -8080,13 +8087,16 @@ msgid "status"
 msgstr "stato"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "uno fra: offline, online, chat, assente, xa, non disturbare, invisibile"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "messaggio"
 
@@ -8328,78 +8338,97 @@ msgstr ""
 "tutti gli 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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Gestisci un uri xmpp:/"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "contenuti messaggi"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Entra in una stanza MUC"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "stanza"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Stanza:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "nickname"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Le password non coincidono"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "Controllare se avahi-daemon è in esecuzione."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Mostra o nascondi la lista contatti"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Parametro mancante \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8408,31 +8437,31 @@ msgstr ""
 "'%s' non appartiene alla lista contatti.\n"
 "Specificare l'account per l'invio del messaggio."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Non ci sono account attivi"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Parametri:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s non trovato"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8441,7 +8470,7 @@ msgstr ""
 "Utilizzo: %s comando [parametri]\n"
 "Il comando è uno fra:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8450,7 +8479,7 @@ msgstr ""
 "Troppi parametri. \n"
 "Scrivere \"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8459,7 +8488,11 @@ msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "URI errato"
 
@@ -8488,176 +8521,177 @@ msgstr "Non è possibile eliminare il tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Invio messaggio privato fallito"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Inserisci nickname"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Cronologia conversazione"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Connessione"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Tutti i partecipanti possono vedere il tuo JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "E' stata creata una nuova stanza"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bloccato: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "l'affiliazione è stata cambiata"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "la stanza è ora accessibile solo ai membri"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 #, fuzzy
 msgid "system shutdown"
 msgstr "spegnimento del sistema"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s è entrato nella chat di gruppo"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 è ora %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Non chiederlo più"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Cambio oggetto"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Specificare il nuovo oggetto:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Cambio nickname"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Specificare il nuovo nickname da usare:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Eliminazione %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8665,22 +8699,22 @@ msgstr ""
 "Stai per cancellare definitivamente questa stanza.\n"
 "Puoi specificare il motivo qui sotto:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Puoi anche inserire un nome alternativo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -8701,61 +8735,61 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Segnala bug"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Dettagli"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim non è il client Jabber predefinito"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Si vuole rendere Gajim il client Jabber predefinito?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Dbus non è supportato."
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Salva immagine come..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8766,172 +8800,172 @@ msgstr ""
 "chat di gruppo %s.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Connessione fallita"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "errore durante l'invio di %s ( %s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Richiesta di abbonamento"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, 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:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Disa_bbonati"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "La stanza ora mostra i membri non disponibili"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "la stanza ora non mostra i membri non disponibili"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "E' stata effettuata una modifica alla configurazione della stanza che non "
 "riguarda la privacy"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "La registrazione dei messaggi della stanza è stata attivata"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "La registrazione dei messaggi della stanza è stata disattivata"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "La stanza è ora completamente non anonima"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "La stanza è ora semi-anonima"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "La stanza è ora completamente anonima"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sei connesso senza la chiave OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 #, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nuova e-mail su %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8941,102 +8975,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Elimina il contatto dalla lista"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "In tutti i _messaggi"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Conflitto di nomi utenti"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Inserire un nuovo nome utente per l'account locale"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Errore."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Conflitto tra risorse"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 "Sei già connesso a questo account con la stessa risorsa. Inseriscine un'altra"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Richiesta di trasferimento file"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9044,15 +9079,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9063,90 +9098,100 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Connessione"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr "Stai per creare un metacontatto. Continuare?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Cifratura disattivata"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Inserire la passphrase della chiave GPG per l'account %s."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ti connetterai a %s senza OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Passphrase errata"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Riscrivere la passphrase GPG o premere Annulla."
 
@@ -9154,44 +9199,44 @@ msgstr "Riscrivere la passphrase GPG o premere Annulla."
 msgid "_New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti ai miei contatti"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Impossibile trovare la base dati delle cronologie"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Contatti"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Nickname"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Messaggio"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9205,16 +9250,16 @@ msgstr ""
 "\n"
 "Nel caso si prema SÌ, attendere..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Esportazione cronologie..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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] ""
@@ -9222,11 +9267,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Si vuole davvero eliminare la cronologia per i contatti selezionati?"
 
-#: ../src/history_manager.py:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Questa operazione è irreversibile."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9267,37 +9312,37 @@ msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Impossibile caricare l'immagine"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "L'immagine è troppo grande"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "Non si è connessi al server"
 
-#: ../src/message_window.py:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Chat di gruppo"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Chat private"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Messaggi"
 
@@ -9309,22 +9354,22 @@ msgstr "- i messaggi saranno registrati"
 msgid "- messages will not be logged"
 msgstr "- i messaggi non saranno registrati"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ha cambiato stato"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s connesso"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s disconnesso"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nuovo messaggio singolo da %(nickname)s"
@@ -9349,7 +9394,7 @@ msgstr "Messaggio inviato da %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nuovo messaggio da %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "nove"
@@ -9358,18 +9403,18 @@ msgstr "nove"
 msgid "Retrieving profile..."
 msgstr "Recupero profilo..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Il file è vuoto"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Il file non esiste"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Impossibile caricare l'immagine"
 
@@ -9401,51 +9446,51 @@ msgstr ""
 "C'è stato un errore nella pubblicazione delle informazioni personali, "
 "riprovare più tardi."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Autorizzazione inviata"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "Non è possibile utilizzare GPG"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ti connetterai a %s senza OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 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:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9453,28 +9498,39 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Si è sicuri di voler uscire dalle stanze \"%s\"?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Annulla trasferimento file"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9483,16 +9539,16 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Leggere tutti gli eventi pendenti prima di rimuovere questo account."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9500,11 +9556,11 @@ msgstr ""
 "Non si potranno più inviare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "I trasporti verranno rimossi"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9513,69 +9569,69 @@ msgstr ""
 "Non si potranno inviare e ricevere messaggi verso i contatti di questi "
 "trasporti:%s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 #, 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:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Rinomina contatto"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Inserire un nuovo nickname per il contatto %s."
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Rinomina Gruppo"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Inserire un nome per il gruppo %s."
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Elimina Gruppo"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Rimuovere il gruppo %s dalla lista?"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 #, 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9584,12 +9640,12 @@ msgstr ""
 "ti vedrà sempre offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "Cosa fare?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9597,16 +9653,16 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Il contatto sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9615,33 +9671,33 @@ msgstr ""
 "Eliminando questi contatti:%s\n"
 "ne verrà rimossa anche l'autorizzazione. Ti vedranno sempre offline."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Il supporto metacontatti non è supportato dal tuo server"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9650,12 +9706,12 @@ msgstr ""
 "Il tuo server non supporta il salvataggio di informazioni metacontatti. "
 "Perciò queste informazioni non saranno salvate al prossimo riavvio."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9665,24 +9721,24 @@ msgstr ""
 "Generalmente si usano quando la stessa persona ha più account jabber o su "
 "vari transport."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "File non valido"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Invia %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Rendi %s e %s metacontatti"
@@ -9692,129 +9748,133 @@ msgstr "Rendi %s e %s metacontatti"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Gestione segnalibri..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "dell'account %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Pubblica"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Pubblica"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Configura la _stanza..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Massimizza tutti"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Invia _messaggio di gruppo"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "A tutti gli utenti"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Utenti _online"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Gestisci contatti"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Invia messaggio singolo"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Esegui comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Gestisci trasporto"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Modifica trasporto"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Massimizza"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Disconnetti"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Gestore cronologia"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Nuova chat di gruppo"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
@@ -9846,13 +9906,13 @@ msgid "Confirm these session options"
 msgstr "Conferma queste opzioni di sessione"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Il client remoto vuole negoziare una sessione con queste caratteristiche:\n"
 "\n"
@@ -9875,117 +9935,127 @@ msgstr ""
 "\n"
 "Continuare la sessione?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Non nei contatti"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "ID Jabber: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [bloccato]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimizzata]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Ultimo stato: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " dalle %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Connesso"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Disconnesso"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Abbonamento: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Demone delle notifiche"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Completato"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?transfer status:In pausa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9993,30 +10063,30 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "dalle %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Applicazioni</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10024,7 +10094,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10032,14 +10102,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -10047,19 +10117,341 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Entra in chat di _gruppo..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Aggiungi Contatto..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Ricerca servizi"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Esegui comando..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Modifica account"
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Informazioni personali"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Inizia chat..."
+
+#~ msgid "_Status"
+#~ msgstr "_Stato"
+
+#~ msgid "Account Modification"
+#~ msgstr "Modifica account"
+
+#~ 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 ""
+#~ "Se marcato, Gajim si connetterà alla porta 5223, sulla quale i server più "
+#~ "vecchi attivano SSL. Notare che Gajim usa la cifratura TLS di default se "
+#~ "il server la annuncia, e abilitando questa opzione TLS sarà disabilitata"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Modifica informazioni personali..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Nome dell'host: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Se marcato, Gajim memorizzerà la password in ~/.gajim/config, con "
+#~ "permessi di lettura solo per l'utente corrente"
+
+#~ msgid "Port: "
+#~ msgstr "Porta: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Salva _passphrase (non sicuro)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Invia pacchetti di keep-alive"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Usa _SSL (vecchio)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Modifica lo stato"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Elimina MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Invia messaggio server..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Ricezione messaggio \n"
+#~ "Contatto disconnesso \n"
+#~ "Cambio di stato del contatto \n"
+#~ "Messaggio di chat di gruppo evidenziato \n"
+#~ "Messaggio di chat di gruppo ricevuto \n"
+#~ "Richiesta di trasferimento file \n"
+#~ "Trasferimento file iniziato \n"
+#~ "Trasferimento file terminato"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "contatto(i)\n"
+#~ "gruppo(i)\n"
+#~ "tutti"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Entra in chat di _gruppo"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Copia JID/indirizzo email"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Copia indirizzo collegamento"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Apri composizione email"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Apri il collegamento nel browser"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Inizia chat"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Account\n"
+#~ "Gruppo\n"
+#~ "Contatto\n"
+#~ "Banner"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Cambia _nickname..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Cambia _oggetto..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Configura la _stanza..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Elimina stanza"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Gestisci stanza"
+
+#~ msgid "Send _File"
+#~ msgstr "Invia _file"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Aggiungi ai contatti"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Invia messaggio privato"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Gestisci account"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-close"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Aggiunge il contatto alla lista"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "sta seguendo la conversazione"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Clicca per inserire un emoticon (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Clicca per inserire un emoticon (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Clicca per inserire un emoticon (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Tutti gli stati di chat\n"
+#~ "Solo composizione\n"
+#~ "Disattivato"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Rilevamento automatico ad ogni avvio di Gajim\n"
+#~ "Usa sempre le applicazioni predefinite di GNOME\n"
+#~ "Usa sempre le applicazioni predefinite di KDE\n"
+#~ "Usa sempre le applicazioni predefinite Xfce\n"
+#~ "Personalizzate"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Mostra immediatamente\n"
+#~ "Mostra una notifica\n"
+#~ "Mostra solo nella lista contatti"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "nessuno\n"
+#~ "entrambi\n"
+#~ "da\n"
+#~ "a"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-close"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Aggiungi _contatto......"
+
+#~ msgid "Fea_tures"
+#~ msgstr "Fun_zioni"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Trasferimenti file"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profilo, a_vatar"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Account"
+
+#~ msgid "_Contents"
+#~ msgstr "_Contenuti"
+
+#~ msgid "_FAQ"
+#~ msgstr "_Domande frequenti"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Preferenze"
+
+#~ msgid "_Quit"
+#~ msgstr "_Esci"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Invia _messaggio singolo..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Invia _messaggio singolo"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_to"
+
+#~ msgid "_Group Chat"
+#~ msgstr "Chat di _gruppo"
+
+#~ msgid "Enable"
+#~ msgstr "Abilita"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modifica account..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Host errato"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Indirizzo locale non valido? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "La dipendenza pysqlite2 (o python-pysqlite2) è mancante. Uscita..."
+
+#~ msgid ""
+#~ "Session bus is not available.\n"
+#~ "Try reading http://trac.gajim.org/wiki/GajimDBus"
+#~ msgstr ""
+#~ "Il bus di sessione non è disponibile.\n"
+#~ "Provare a leggere http://trac.gajim.org/wiki/GajimDBus"
+
+#, fuzzy
+#~ msgid "Requires python-sexy."
+#~ msgstr "Richiede python-dbus."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "Supporto libglade mancante nel runtime GTK+"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Eliminare il runtime GTK+ corrente ed installare l'ultima versione "
+#~ "stabile da %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr "Verificare che GTK+ e PyGTK abbiano supporto libglade sul sistema."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim ha bisogno di PySQLite2 per essere eseguito"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "Messaggio in _arrivo:"
 
@@ -10282,10 +10674,6 @@ msgstr " risorsa con priorità "
 #~ msgid "Gajim account %s"
 #~ msgstr "Account Gajim %s"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Personalizzato</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "ID Jabber duplicato"
 
@@ -10638,9 +11026,6 @@ msgstr " risorsa con priorità "
 #~ msgstr ""
 #~ "Salva _posizione e dimensione delle finestre di chat e lista contatti"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Mostra solo nella lista _contatti"
-
 #~ msgid "Use t_rayicon (aka. notification area icon)"
 #~ msgstr "Usa _icona nell'area di notifica (vassoio di sistema)"
 
@@ -10656,15 +11041,6 @@ msgstr " risorsa con priorità "
 #~ "solo se si tratta di un nuovo messaggio da un contatto con cui non si sta "
 #~ "già chattando"
 
-#~ msgid "_Never"
-#~ msgstr "_Mai"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Notifica"
-
-#~ msgid "_Pop it up"
-#~ msgstr "_Mostra"
-
 #~ msgid "Add _Contact"
 #~ msgstr "Aggiungi _contatto"
 
@@ -10713,9 +11089,6 @@ msgstr " risorsa con priorità "
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo e Giulietta</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Vecchie storie"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquio"
 
@@ -11054,9 +11427,6 @@ msgstr " risorsa con priorità "
 #~ msgid "(%s/s)"
 #~ msgstr "(%s/s)"
 
-#~ msgid "Session bus is not available."
-#~ msgstr "Il bus di sessione non è disponibile."
-
 #~ msgid "Kind"
 #~ msgstr "Tipo"
 
diff --git a/po/ja.po b/po/ja.po
index c16f407fa..83b7e4a14 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.13.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-10 22:07+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2010-03-10 17:59+0900\n"
 "Last-Translator: Mako N. <mako@pasero.net>\n"
 "Language-Team: Japanese\n"
@@ -15,6 +15,2742 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ../data/gui/account_context_menu.ui.h:1
+msgid "_Open Gmail Inbox"
+msgstr "Gmail の受信箱を開く (_O)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:1
+msgid ""
+"<b>Connecting to server</b>\n"
+"\n"
+"Please wait..."
+msgstr ""
+"<b>サーバに接続しています</b>\n"
+"\n"
+"しばらくお待ちください..."
+
+#: ../data/gui/account_creation_wizard_window.ui.h:4
+msgid "<b>Please choose one of the options below:</b>"
+msgstr "<b>下の選択肢から一つ選んでください:</b>"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:5
+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:7
+msgid "@"
+msgstr "@"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+"この証明書を、信頼できる証明書一覧に加えます。\n"
+"この証明書の SHA1 指紋:\n"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:11
+msgid "Anon_ymous authentication"
+msgstr "匿名の認証 (_y)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:12
+msgid "Connect when I press Finish"
+msgstr "「完了」を押したらすぐに接続する"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:13
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: アカウント作成ウィザード"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:14
+msgid "I already have an account I want to _use"
+msgstr "既にアカウントを持っているのでそれを使う (_u)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:15
+msgid "I want to _register for a new account"
+msgstr "新しいアカウントを作成する (_r)"
+
+#: ../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 "チェックをつけると、Gajim はこのアカウントのパスワードを記憶します"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:17
+msgid "Manage..."
+msgstr "管理..."
+
+#: ../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 "なし"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
+msgid "Prox_y:"
+msgstr "プロキシ (_y)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
+msgid "Save pass_word"
+msgstr "パスワードを保存する"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:21
+msgid "Set my profile when I connect"
+msgstr "接続時に自分のプロフィールを設定する"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:22
+msgid "Use custom hostname/port"
+msgstr "別のホスト名/ポート番号を使う"
+
+#: ../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."
+msgstr "Jabber ネットワークに接続するには、アカウントが必要です。"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
+msgid "_Advanced"
+msgstr "拡張 (_A)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:26
+msgid "_Finish"
+msgstr "完了 (_F)"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:27
+msgid "_Hostname:"
+msgstr "ホスト名 (_H):"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
+msgid "_Jabber ID:"
+msgstr "Jabber ID (_J):"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
+msgid "_Password:"
+msgstr "パスワード (_P):"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:30
+msgid "_Port:"
+msgstr "ポート番号 (_P):"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:31
+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: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 "アカウント"
+
+#: ../data/gui/accounts_window.ui.h:8
+msgid "Administration operations"
+msgstr "管理の操作"
+
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "匿名の認証"
+
+#: ../data/gui/accounts_window.ui.h:10
+msgid "Auto-reconnect when connection is lost"
+msgstr "切断したら自動で再接続する"
+
+#: ../data/gui/accounts_window.ui.h:11
+msgid "C_onnect on Gajim startup"
+msgstr "Gajim 起動時に接続する (_o)"
+
+#: ../data/gui/accounts_window.ui.h:12
+msgid "Chan_ge Password"
+msgstr "パスワードを変更する (_g)"
+
+#: ../data/gui/accounts_window.ui.h:13
+msgid ""
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
+msgstr ""
+"チェックをつけると、安全でない接続の前にパスワードを聞いてくるようになりま"
+"す。"
+
+#: ../data/gui/accounts_window.ui.h:14
+msgid "Choose _Key..."
+msgstr "鍵の選択 (_K)..."
+
+#: ../data/gui/accounts_window.ui.h:15
+msgid "Click to change account's password"
+msgstr "アカウントのパスワードを変更するにはクリック"
+
+#: ../data/gui/accounts_window.ui.h:16
+msgid "Click to request authorization to all contacts of another account"
+msgstr "別アカウントのすべての相手先に承認を求めるにはクリック"
+
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim 起動時に接続する (_n)"
+
+#: ../data/gui/accounts_window.ui.h:18
+msgid "Connection"
+msgstr "接続"
+
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "E-メール:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "名:"
+
+#. 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 "全般"
+
+# (Mako)broadcast 困った。ここは「同報」で
+#: ../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 ""
+"チェックをつけると、Gajim はあなたの IP を除くいくつかの IP に同報します。そ"
+"れによってファイル転送はうまくいく可能性が高くなります。"
+
+#: ../data/gui/accounts_window.ui.h:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"チェックをつけると、Gajim は seahorse など GPG エージェントからパスワードを受"
+"け取ります"
+
+#: ../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 ""
+"チェックをつけると、Gajim はタイムアウトで接続が切れてしまうのを防ぐために生"
+"存パケットを流すようになります"
+
+#: ../data/gui/accounts_window.ui.h:27
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"チェックをつけると、Gajim は起動時に、このアカウントを使って jabber に自動的"
+"に接続します"
+
+#: ../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 ""
+"チェックをつけると、(名簿ウィンドウの最下段の選択肢による)全体の在席状況の変"
+"更がこのアカウントの在席状況の変更に反映されます。"
+
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"受信メッセージに使われるデフォルトのポートが設定に合わない場合、ここで別の"
+"ポートを指定できます。\n"
+"ファイアーウォールの設定を考慮しましょう。"
+
+#: ../data/gui/accounts_window.ui.h:31
+msgid "Information about you, as stored in the server"
+msgstr "サーバに格納する、あなたに関する情報です"
+
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "姓:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "アカウントの統合 (_g)"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
+msgid "No key selected"
+msgstr "鍵が選択されていません"
+
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
+msgid "Personal Information"
+msgstr "個人情報"
+
+#: ../data/gui/accounts_window.ui.h:38
+msgid "Priori_ty:"
+msgstr "優先順位 (_t):"
+
+#: ../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 ""
+"優先順位は、同じアカウントで二つ以上のクライアントから接続しているときに "
+"jabber サーバーからのイベントの受け取り先を決定するのに使われます。最も高い優"
+"先順位のクライアントがイベントを受け取ります"
+
+#: ../data/gui/accounts_window.ui.h:40
+msgid "Priority will change automatically according to your status."
+msgstr "優先順位は、在席状況に応じて自動的に変わります。"
+
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "名前の変更 (_n)"
+
+#: ../data/gui/accounts_window.ui.h:42
+msgid "Resour_ce:"
+msgstr "リソース (_c):"
+
+#: ../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 ""
+"リソースとは、同じサーバーに同じアカウントで複数のクライアントからの接続があ"
+"る場合に、同じ JID を区別するために送信されます。たとえば、同じアカウントでリ"
+"ソースを 'Home' と 'Work' として同時に接続しているかもしれません。最も優先順"
+"位の高いリソースがイベントを受け取ります(下記参照)。"
+
+#: ../data/gui/accounts_window.ui.h:44
+msgid "Save conversation _logs for all contacts"
+msgstr "すべての相手先の会話記録を保存する (_l)"
+
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "生存パケットを送信する (_k)"
+
+#: ../data/gui/accounts_window.ui.h:47
+msgid "Synch_ronize account status with global status"
+msgstr "アカウントの在席状況を全体の在席状況に合わせる (_r)"
+
+#: ../data/gui/accounts_window.ui.h:48
+msgid "Synchroni_ze account status with global status"
+msgstr "アカウントの在席状況を全体の在席状況に合わせる (_z)"
+
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "相手先の同期"
+
+#: ../data/gui/accounts_window.ui.h:50
+msgid "Use G_PG Agent"
+msgstr "GPG エージェントを使う (_P)"
+
+#: ../data/gui/accounts_window.ui.h:51
+msgid "Use cust_om hostname/port"
+msgstr "別のホスト名/ポート番号を使う (_o)"
+
+#: ../data/gui/accounts_window.ui.h:52
+msgid "Use cust_om port:"
+msgstr "別のポート番号を使う (_o):"
+
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "ファイル転送のプロキシを使う"
+
+#: ../data/gui/accounts_window.ui.h:54
+msgid "_Edit Personal Information..."
+msgstr "個人情報を編集する (_E)..."
+
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
+msgid "_Enable"
+msgstr "有効 (_E)"
+
+#: ../data/gui/accounts_window.ui.h:56
+msgid "_Hostname: "
+msgstr "ホスト名 (_H):"
+
+#: ../data/gui/accounts_window.ui.h:58
+msgid "_Manage..."
+msgstr "管理 (_M)..."
+
+#: ../data/gui/accounts_window.ui.h:60
+msgid "_Port: "
+msgstr "ポート番号 (_P):"
+
+#: ../data/gui/accounts_window.ui.h:61
+msgid "_Warn before using an insecure connection"
+msgstr "安全でない接続の前には警告する (_W)"
+
+#: ../data/gui/accounts_window.ui.h:62
+msgid "_use HTTP__PROXY environment variable"
+msgstr "環境変数 HTTP__PROXY を使う (_u)"
+
+#: ../data/gui/add_new_contact_window.ui.h:1
+msgid "A_ccount:"
+msgstr "アカウント (_c):"
+
+#: ../data/gui/add_new_contact_window.ui.h:2
+msgid "A_llow this contact to view my status"
+msgstr "この相手先に自分の在席状況を見ることを許可する (_l)"
+
+#: ../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: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 ""
+"このプロトコルの相手先を追加するためには、\n"
+"この中継先に登録しなければなりません。\n"
+"登録ボタンを押して次に進んでください。"
+
+#: ../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 ""
+"このプロトコルの相手先を追加するためには、\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 "登録 (_R)"
+
+#: ../data/gui/add_new_contact_window.ui.h:15
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "在席通知の申し込み (_S)"
+
+#: ../data/gui/add_new_contact_window.ui.h:16
+msgid "_User ID:"
+msgstr "ユーザー ID (_U):"
+
+#: ../data/gui/adhoc_commands_window.ui.h:1
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>エラーが発生しました:</b>"
+
+#: ../data/gui/adhoc_commands_window.ui.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>実行するコマンドを選択してください:</b>"
+
+#: ../data/gui/adhoc_commands_window.ui.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc コマンド - Gajim"
+
+#: ../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 "エラーの説明..."
+
+#: ../data/gui/adhoc_commands_window.ui.h:6
+msgid "Please wait while retrieving command list..."
+msgstr "コマンド一覧を取得しています。しばらくお待ちください..."
+
+#: ../data/gui/adhoc_commands_window.ui.h:7
+msgid "Please wait while the command is sending..."
+msgstr "コマンドを送信しています。しばらくお待ちください..."
+
+#: ../data/gui/adhoc_commands_window.ui.h:8
+msgid "Please wait..."
+msgstr "しばらくお待ちください..."
+
+# (Mako)entity はしかたなくカタカナで
+#: ../data/gui/adhoc_commands_window.ui.h:9
+msgid "This jabber entity does not expose any commands."
+msgstr "このエンティティはコマンドを受け付けません。"
+
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
+msgid "<b>Description</b>"
+msgstr "<b>説明</b>"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>注意:</b> 設定を有効にするには Gajim を再起動してください"
+
+#: ../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_menuitem_menu.ui.h:1
+msgid "Deletes Message of the Day"
+msgstr "今日のメッセージを削除します"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
+msgid "Edit _Privacy Lists..."
+msgstr "プライバシーリストを編集..."
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
+msgid "Sends a message to users currently connected to this server"
+msgstr "現在このサーバーに接続しているユーザーにメッセージを送信する"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
+msgid "Set MOTD..."
+msgstr "MOTD を設定..."
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
+msgid "Sets Message of the Day"
+msgstr "今日のメッセージを設定します"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
+msgid "Show _XML Console"
+msgstr "XML コンソールを表示 (_X)"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
+msgid "Update MOTD..."
+msgstr "MOTD を更新..."
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
+msgid "Updates Message of the Day"
+msgstr "今日のメッセージを更新します"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "_Administrator"
+msgstr "管理人 (_A)"
+
+#: ../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
+#, fuzzy
+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
+#, fuzzy
+msgid "All statuses"
+msgstr "すべての状況"
+
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Have "
+msgstr "持っています "
+
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
+msgid "Invisible"
+msgstr "隠れています"
+
+#: ../data/gui/advanced_notifications_window.ui.h:20
+#, fuzzy
+msgid "Launch a command"
+msgstr "コマンドを実行する"
+
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
+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
+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
+#, fuzzy
+msgid ""
+"_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+msgstr ""
+"タスクバーのフラッシュでチャットウィンドウを作るために、ウィンドウマネージャ"
+"の UrgencyHint を有効にする (_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 roster"
+msgstr "名簿へのイベントの表示をやめる (_D)"
+
+#: ../data/gui/advanced_notifications_window.ui.h:32
+msgid "_Disable showing event in systray"
+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 roster"
+msgstr "イベントを名簿に表示する (_S)"
+
+#: ../data/gui/advanced_notifications_window.ui.h:36
+msgid "_Show event in systray"
+msgstr "イベントをシステムトレイに表示する (_S)"
+
+#: ../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
+#, fuzzy
+msgid "for "
+msgstr "4"
+
+#: ../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/atom_entry_window.ui.h:1
+msgid "Entry:"
+msgstr "エントリー:"
+
+#: ../data/gui/atom_entry_window.ui.h:2
+msgid "Feed name:"
+msgstr "フィード名:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
+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:124
+msgid "You have received new entry:"
+msgstr "新しいエントリーを受け取りました:"
+
+#: ../data/gui/blocked_contacts_window.ui.h:1
+msgid "Blocked Contacts"
+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
+msgid "Set an activity"
+msgstr "動向の設定"
+
+#: ../data/gui/change_mood_dialog.ui.h:1
+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_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_status_message_dialog.ui.h:1
+msgid "<b>Type your new status message</b>"
+msgstr "<b>新しい状況メッセージを入力してください</b>"
+
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
+msgid "Activity:"
+msgstr "動向:"
+
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
+msgid "Mood:"
+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 "用意しておくメッセージとして保存..."
+
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "送信 (_S)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../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
+msgid ""
+"You are going to begin a Multi-User Chat.\n"
+"Select the contacts you want to invite"
+msgstr ""
+"グループチャットを始めようとしています。\n"
+"招待したい相手先を選択してください"
+
+#: ../data/gui/contact_context_menu.ui.h:1
+msgid "A_sk to see his/her status"
+msgstr "相手の在席状況を見ることを申し込む (_s)"
+
+#: ../data/gui/contact_context_menu.ui.h:2
+msgid "Add Special _Notification..."
+msgstr "特別な状態通知を追加する (_N)..."
+
+#: ../data/gui/contact_context_menu.ui.h:3
+msgid "Assign Open_PGP Key..."
+msgstr "Open_PGP 鍵の割り当て..."
+
+#: ../data/gui/contact_context_menu.ui.h:4
+msgid "E_xecute Command..."
+msgstr "コマンドの実行 (_x)..."
+
+#: ../data/gui/contact_context_menu.ui.h:5
+msgid "Edit _Groups..."
+msgstr "グループの変更 (_G)..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
+msgid "In_vite to"
+msgstr "招待 (_v)"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+msgid "Invite _Contacts"
+msgstr "相手先を招待 (_C)"
+
+#: ../data/gui/contact_context_menu.ui.h:8
+#, fuzzy
+msgid "Remo_ve"
+msgstr "削除 (_R)"
+
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
+msgid "Send Cus_tom Status"
+msgstr "個別の在席状況の送信 (_t)"
+
+#: ../data/gui/contact_context_menu.ui.h:10
+msgid "Send Single _Message..."
+msgstr "単発メッセージの送信 (_M)..."
+
+#: ../data/gui/contact_context_menu.ui.h:11
+msgid "Send _File..."
+msgstr "ファイルの送信 (_S)..."
+
+#: ../data/gui/contact_context_menu.ui.h:12
+msgid "Set Custom _Avatar..."
+msgstr "独自アバターの設定 (_A)..."
+
+#: ../data/gui/contact_context_menu.ui.h:13
+msgid "Start _Chat"
+msgstr "チャットの開始 (_C)"
+
+#: ../data/gui/contact_context_menu.ui.h:14
+msgid "Toggle End to End Encryption"
+msgstr "全線暗号化(E2EE) (トグル)"
+
+#: ../data/gui/contact_context_menu.ui.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Open_PGP 暗号化 (トグル)"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "名簿に追加する (_A)..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
+msgid "_Allow him/her to see my status"
+msgstr "自分の在席状況を見られることを許可する (_A)"
+
+#: ../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 "拒否 (_B)"
+
+#: ../data/gui/contact_context_menu.ui.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "自分の在席状況を見られることを禁止する (_F)"
+
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
+msgid "_History"
+msgstr "履歴 (_H)"
+
+#: ../data/gui/contact_context_menu.ui.h:21
+msgid "_Ignore"
+msgstr "無視 (_I)"
+
+#: ../data/gui/contact_context_menu.ui.h:22
+msgid "_Manage Contact"
+msgstr "相手先の管理 (_M)"
+
+#: ../data/gui/contact_context_menu.ui.h:23
+msgid "_Rename..."
+msgstr "名前の変更 (_R)..."
+
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Subscription"
+msgstr "在席通知の申し込み (_S)"
+
+#: ../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 "拒否の解除 (_U)"
+
+#: ../data/gui/contact_context_menu.ui.h:26
+msgid "_Unignore"
+msgstr "無視しない (_U)"
+
+#: ../data/gui/data_form_window.ui.h:1
+msgid "Fill in the form."
+msgstr "次の欄を埋めてください。"
+
+# (Mako)Personal Eventing via Pubsub
+#: ../data/gui/data_form_window.ui.h:2
+#, fuzzy
+msgid "Room Configuration"
+msgstr "PEP サービスの調整"
+
+#: ../data/gui/edit_groups_dialog.ui.h:1
+msgid "Edit Groups"
+msgstr "グループの編集"
+
+#: ../data/gui/esession_info_window.ui.h:1
+#, fuzzy
+msgid "(<b>ESession</b> info)"
+msgstr "<b>説明</b>"
+
+#: ../data/gui/esession_info_window.ui.h:2
+msgid "_Verify"
+msgstr "検査 (_V)"
+
+#: ../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 "ファイル転送の転送中、完了、中止の一覧"
+
+#: ../data/gui/filetransfers.ui.h:2
+#, fuzzy
+msgid "Cancel file transfer"
+msgstr "選択されたファイルの転送を中止します"
+
+#: ../data/gui/filetransfers.ui.h:3
+msgid "Cancels the selected file transfer"
+msgstr "選択されたファイルの転送を中止します"
+
+#: ../data/gui/filetransfers.ui.h:4
+msgid "Cancels the selected file transfer and removes incomplete file"
+msgstr "選択されたファイルの転送を中止し、不完全なファイルは削除します"
+
+#: ../data/gui/filetransfers.ui.h:5
+msgid "Clean _up"
+msgstr "消去 (_u)"
+
+#: ../data/gui/filetransfers.ui.h:6
+msgid "File Transfers"
+msgstr "ファイルの転送"
+
+# (Mako)この場合は「閉じる」
+#: ../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
+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"
+msgstr ""
+"一覧からひとつのファイル転送を削除します。転送中の場合、まず転送を中止し、そ"
+"れから削除してください"
+
+#: ../data/gui/filetransfers.ui.h:12
+msgid "When a file transfer is complete show a popup notification"
+msgstr "ファイル転送が完了したら、ポップアップで知らせる"
+
+#: ../data/gui/filetransfers.ui.h:13
+msgid "_Notify me when a file transfer is complete"
+msgstr "ファイル転送が完了したら知らせる (_N)"
+
+#: ../data/gui/filetransfers.ui.h:14
+msgid "_Pause"
+msgstr "一時停止 (_P)"
+
+#: ../data/gui/filetransfers.ui.h:15
+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
+#, fuzzy
+msgid "Account row"
+msgstr "アカウント"
+
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
+msgid "Bold"
+msgstr "太字にする"
+
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
+msgid "Composing"
+msgstr "入力中"
+
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "相手先"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
+msgid "Font style:"
+msgstr "フォントのスタイル:"
+
+#: ../data/gui/gajim_themes_window.ui.h:8
+msgid "Gajim Themes Customization"
+msgstr "Gajim テーマのカスタマイズ"
+
+#: ../data/gui/gajim_themes_window.ui.h:9
+msgid "Gone"
+msgstr "不在"
+
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "グループ"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
+msgid "Inactive"
+msgstr "活動停止中"
+
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
+msgid "Italic"
+msgstr "イタリック"
+
+#: ../data/gui/gajim_themes_window.ui.h:13
+msgid ""
+"MUC\n"
+"Messages"
+msgstr ""
+"グループチャット\n"
+"メッセージ"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid ""
+"MUC Directed\n"
+"Messages"
+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 "_Minimize on close"
+msgstr "閉じるボタンで最小化 (_M)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:1
+msgid "Mo_derator"
+msgstr "司会者 (_d)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
+msgid "Occupant Actions"
+msgstr "在室者の操作"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "_Admin"
+msgstr "管理人 (_A)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:4
+msgid "_Ban"
+msgstr "締め出し (_B)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "_Kick"
+msgstr "蹴り出し (_K)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "メンバー (_M)"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
+msgid "_Owner"
+msgstr "主宰者 (_O)"
+
+# (Mako)moderated room での発言する権利
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Voice"
+msgstr "発言権 (_V)"
+
+#: ../data/gui/groups_post_window.ui.h:1
+#, fuzzy
+msgid "Create new post"
+msgstr "新しいポストの作成"
+
+# #(Mako)helpers.pyは、
+# 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
+#, fuzzy
+msgid "From"
+msgstr "こちらが承認"
+
+#. holds subject
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
+msgid "Subject"
+msgstr "題"
+
+#: ../data/gui/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 が起動していないときに実行してください。一"
+"般に、チャットしている最中の相手先の削除は避けてください。"
+
+#: ../data/gui/history_manager.ui.h:3
+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
+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 ""
+"この記録マネージャは記録を見るためのものではありません。そのような機能をお求"
+"めなら、かわりに履歴ウィンドウをお使いください。\n"
+"\n"
+"このプログラムは記録の削除や書き出しのためにお使いください。左の一覧から記録"
+"を選択し、また下の欄でデータベースを検索することができます。"
+
+#: ../data/gui/history_manager.ui.h:9
+msgid "_Search Database"
+msgstr "データベースの検索 (_S)"
+
+#: ../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
+#, fuzzy
+msgid "Groupchat Histories"
+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 "_Log conversation history"
+msgstr "会話の履歴を記録 (_L)"
+
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "一覧 (_B)"
+
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
+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:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "Nickname:"
+msgstr "ニックネーム:"
+
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "Password:"
+msgstr "パスワード:"
+
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Recently:"
+msgstr "最近使った:"
+
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "Room:"
+msgstr "談話室:"
+
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "サーバー:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "この談話室をブックマーク"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
+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 "チェックをつけると、スタート時にこのグループチャットに参加します"
+
+#: ../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 "自動参加して最小化"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:7
+msgid "Print status:"
+msgstr "状況の表示:"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:10
+msgid "Title:"
+msgstr "タイトル:"
+
+# (Mako)Personal Eventing via Pubsub
+#: ../data/gui/manage_pep_services_window.ui.h:1
+#, fuzzy
+msgid "PEP Service Configuration"
+msgstr "PEP サービスの調整"
+
+#: ../data/gui/manage_pep_services_window.ui.h:2
+msgid "_Configure"
+msgstr "調整 (_C)"
+
+#: ../data/gui/manage_proxies_window.ui.h:1
+msgid "<b>Properties</b>"
+msgstr "<b>プロパティ</b>"
+
+#: ../data/gui/manage_proxies_window.ui.h:2
+msgid "<b>Settings</b>"
+msgstr "<b>設定</b>"
+
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
+#, fuzzy
+msgid "HTTP Connect"
+msgstr "接続中"
+
+#: ../data/gui/manage_proxies_window.ui.h:5
+msgid "Manage Proxy Profiles"
+msgstr "プロクシの設定"
+
+#: ../data/gui/manage_proxies_window.ui.h:6
+msgid "Pass_word:"
+msgstr "パスワード (_w):"
+
+#: ../data/gui/manage_proxies_window.ui.h:7
+msgid "Proxy _Host:"
+msgstr "プロキシのホスト (_H):"
+
+#: ../data/gui/manage_proxies_window.ui.h:8
+msgid "Proxy _Port:"
+msgstr "プロキシのポート (_P):"
+
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../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:12
+msgid "_BOSH URL:"
+msgstr "BOSH URL (_B):"
+
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "名前 (_N):"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
+msgid "_Type:"
+msgstr "種類 (_T):"
+
+#: ../data/gui/manage_proxies_window.ui.h:15
+msgid "_Username:"
+msgstr "ユーザー名 (_U):"
+
+#: ../data/gui/passphrase_dialog.ui.h:1
+msgid "Passphrase"
+msgstr "パスフレーズ"
+
+#: ../data/gui/preferences_window.ui.h:1
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>詳細設定エディタ</b>"
+
+#: ../data/gui/preferences_window.ui.h:2
+msgid "<b>Applications</b>"
+msgstr "<b>アプリケーション</b>"
+
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>操作</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
+msgid "<b>Auto Status</b>"
+msgstr "<b>在席状況の自動変更</b>"
+
+#: ../data/gui/preferences_window.ui.h:5
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>チャットの外観</b>"
+
+#: ../data/gui/preferences_window.ui.h:6
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>チャット行の色</b> "
+
+#: ../data/gui/preferences_window.ui.h:7
+msgid "<b>Chat state notifications</b>"
+msgstr "チャット状態の通知"
+
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>状況</b>"
+
+#. a header for custom browser/client/file manager. so translate sth like: Custom Settings
+#: ../data/gui/preferences_window.ui.h:10
+#, fuzzy
+msgid "<b>Custom</b>"
+msgstr "<b>カスタム</b>"
+
+#: ../data/gui/preferences_window.ui.h:11
+msgid "<b>Font</b>"
+msgstr "<b>フォント</b>"
+
+#: ../data/gui/preferences_window.ui.h:12
+msgid "<b>GMail Options</b>"
+msgstr "<b>GMail オプション</b>"
+
+#: ../data/gui/preferences_window.ui.h:14
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>用意された状況メッセージ</b>"
+
+#: ../data/gui/preferences_window.ui.h:15
+msgid "<b>Privacy</b>"
+msgstr "<b>プライバシー</b>"
+
+#: ../data/gui/preferences_window.ui.h:16
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>名簿の外観</b>"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "<b>Status Messages</b>"
+msgstr "<b>在席状況のメッセージ</b>"
+
+#: ../data/gui/preferences_window.ui.h:19
+msgid "<b>Themes</b>"
+msgstr "<b>テーマ</b>"
+
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Middle:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>目への通知</b>"
+
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
+msgid "Advanced"
+msgstr "拡張"
+
+#: ../data/gui/preferences_window.ui.h:24
+msgid "Advanced..."
+msgstr "拡張..."
+
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "すべての状況"
+
+#: ../data/gui/preferences_window.ui.h:26
+msgid "Allow _OS information to be sent"
+msgstr "OS 情報の送信を許可する (_O)"
+
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "OS 情報の送信を許可する (_O)"
+
+#: ../data/gui/preferences_window.ui.h:28
+msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
+msgstr "離席/不在/取り込み中/隠れ中のポップアップ/通知を許可する (_a)"
+
+#: ../data/gui/preferences_window.ui.h:29
+msgid "Allow sound when I'm _busy"
+msgstr "取り込み中でもサウンドを鳴らす (_b)"
+
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "離席中です"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+# (Mako)語順が難しい
+#: ../data/gui/preferences_window.ui.h:34
+msgid "Ask status message when I:"
+msgstr "状況メッセージを求めるのは、私が "
+
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+#, fuzzy
+msgid "Audio input device"
+msgstr "デフォルトのメッセージ"
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "Gajim 起動時に接続する (_o)"
+
+#: ../data/gui/preferences_window.ui.h:39
+msgid "Chat message:"
+msgstr "チャットメッセージ:"
+
+#: ../data/gui/preferences_window.ui.h:40
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "起動時に、Gajim がデフォルトの Jabber クライアントかを調べる (_d)"
+
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "入力中"
+
+#: ../data/gui/preferences_window.ui.h:42
+msgid "Configure color and font of the interface"
+msgstr "色とフォントの調整"
+
+#: ../data/gui/preferences_window.ui.h:43
+#, fuzzy
+msgid "Contact's message:"
+msgstr "チャットメッセージ:"
+
+#: ../data/gui/preferences_window.ui.h:44
+#, fuzzy
+msgid "Contact's nickname:"
+msgstr "名前"
+
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>カスタム</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "無効"
+
+#: ../data/gui/preferences_window.ui.h:51
+msgid "Display _activity of contacts in roster"
+msgstr "名簿に相手先の動向を表示する (_a)"
+
+#: ../data/gui/preferences_window.ui.h:52
+msgid "Display _extra email details"
+msgstr "メールの詳細を表示する (_e)"
+
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "名簿に相手先の気分を表示する (_o)"
+
+#: ../data/gui/preferences_window.ui.h:54
+msgid "Display _tunes of contacts in roster"
+msgstr "名簿に相手先の聴いている楽曲を表示する (_t)"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Display a_vatars of contacts in roster"
+msgstr "名簿に相手先のアバターを表示する"
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Display m_ood of contacts in roster"
+msgstr "名簿に相手先の気分を表示する (_o)"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "Display status _messages of contacts in roster"
+msgstr "名簿に相手先の状況メッセージを表示する"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim は、相手先との会話に関連するメタ情報の送受信ができます。ここでは、"
+"チャットウィンドウへのチャット状態の表示について指定します。"
+
+#: ../data/gui/preferences_window.ui.h:59
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim は、相手先との会話に関連するメタ情報の送受信ができます。ここでは、"
+"チャット状態の他人への送信について指定します。"
+
+#: ../data/gui/preferences_window.ui.h:60
+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:62
+msgid "Hide all buttons in chat windows"
+msgstr "チャットウィンドウのすべてのボタンを隠します"
+
+#: ../data/gui/preferences_window.ui.h:63
+msgid ""
+"If checked, Gajim will allow others to detect the operation system you are "
+"using"
+msgstr "チェックをつけると、Gajim は使用中の OS を知られることを許可します"
+
+#: ../data/gui/preferences_window.ui.h:64
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr "チェックをつけると、Gajim は電子メールの送信者の情報を含めます"
+
+#: ../data/gui/preferences_window.ui.h:65
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"チェックをつけると、Gajim はコンピュータが使われていないとき、在席状況を「離"
+"席中」に変更します"
+
+#: ../data/gui/preferences_window.ui.h:66
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+"チェックをつけると、Gajim はコンピュータが長い間使われていないとき、在席状況"
+"を「不在」に変更します"
+
+#: ../data/gui/preferences_window.ui.h:67
+msgid ""
+"If checked, Gajim will display avatars of contacts in roster window and in "
+"group chats"
+msgstr ""
+"チェックをつけると、Gajim は名簿ウィンドウとグループチャットに相手先のアバ"
+"ターを表示します"
+
+#: ../data/gui/preferences_window.ui.h:68
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window and in group chats"
+msgstr ""
+"チェックをつけると、Gajim は名簿ウィンドウとグループチャットの相手先名の下に"
+"状況メッセージを表示します"
+
+#: ../data/gui/preferences_window.ui.h:69
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の動向を表示します"
+
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
+
+#: ../data/gui/preferences_window.ui.h:71
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr "チェックをつけると、Gajim は名簿ウィンドウに相手先の気分を表示します"
+
+#: ../data/gui/preferences_window.ui.h:72
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"チェックをつけると、Gajim は名簿ウィンドウに相手先の聴いている楽曲を表示しま"
+"す"
+
+#: ../data/gui/preferences_window.ui.h:73
+msgid ""
+"If checked, Gajim will highlight spelling errors in input fields of chat "
+"windows. If no language is explicitly set via right click on the input "
+"field, the default language will be used for this contact or group chat."
+msgstr ""
+"チェックをつけると、Gajim はチャットウィンドウの入力欄でスペルの間違いを強調"
+"して表示します。入力欄での右クリックで言語を明示的に指定できますが、そうされ"
+"ていない場合は、この相手先やグループチャットにはデフォルトの言語が適用されま"
+"す。"
+
+#: ../data/gui/preferences_window.ui.h:74
+msgid ""
+"If checked, Gajim will ignore incoming events from unauthorized contacts. "
+"Use with caution, because it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"チェックをつけると、Gajim は承認していない相手先からのイベントを無視します。"
+"名簿にない相手先からのすべてのメッセージを拒否しますので、注意してください。"
+
+#: ../data/gui/preferences_window.ui.h:75
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"チェックをつけると、Gajim は暗号化されたメッセージを記録に残します。終端間暗"
+"号化 (E2EE) の場合は相手先が記録に同意していなければなりません。そうでなけれ"
+"ば記録しないでください。"
+
+#: ../data/gui/preferences_window.ui.h:76
+msgid ""
+"If checked, Gajim will show a notification when a new e-mail is received via "
+"GMail"
+msgstr ""
+"チェックをつけると、Gajim は GMail 経由で新しいメールを受け取ったとき、通知し"
+"ます"
+
+#: ../data/gui/preferences_window.ui.h:77
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"チェックをつけると、Gajim はプロトコル特有の在席状況アイコンを使用します "
+"(例: MSN からの相手先にはオンライン、離席、取り込み中...などの対応する MSN の"
+"アイコンがあります)"
+
+#: ../data/gui/preferences_window.ui.h:78
+msgid ""
+"If enabled, Gajim will not ask for a status message. The specified default "
+"message will be used instead."
+msgstr ""
+"チェックをつけると、Gajim は状況メッセージを要求しません。かわりに対応するデ"
+"フォルトのメッセージが使われます。"
+
+#: ../data/gui/preferences_window.ui.h:79
+msgid ""
+"If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
+"animated or static graphical emoticons"
+msgstr ""
+"「無効」でなければ、Gajim は ':)' のようなスマイリーを対応する画像に置き換え"
+"ます"
+
+#: ../data/gui/preferences_window.ui.h:80
+msgid "Log _encrypted chat session"
+msgstr "暗号化チャットを記録する (_e)"
+
+#: ../data/gui/preferences_window.ui.h:81
+msgid "Ma_ke message windows compact"
+msgstr "メッセージウィンドウを簡潔にする (_k)"
+
+#: ../data/gui/preferences_window.ui.h:82
+msgid "Ma_nage..."
+msgstr "設定 (_n)..."
+
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "サーバー"
+
+#: ../data/gui/preferences_window.ui.h:84
+msgid "Notifications"
+msgstr "通知"
+
+#: ../data/gui/preferences_window.ui.h:85
+msgid "Notify me about contacts that sign _in"
+msgstr "相手先のログインを通知する (_i)"
+
+#: ../data/gui/preferences_window.ui.h:86
+msgid "Notify me about contacts that sign _out"
+msgstr "相手先のログアウトを通知する (_o)"
+
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "相手先のログアウトを通知する (_o)"
+
+#: ../data/gui/preferences_window.ui.h:88
+msgid "Notify on new _GMail email"
+msgstr "新しい GMail メールを通知する (_G)"
+
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"表示しない\n"
+"保留イベントがあるときだけ\n"
+"常に"
+
+#: ../data/gui/preferences_window.ui.h:90
+msgid "Personal Events"
+msgstr "個人イベント"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "Play _sounds"
+msgstr "サウンドを鳴らす (_s)"
+
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:93
+msgid "Preferences"
+msgstr "設定"
+
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "サーバー:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "イベントを名簿に表示する (_S)"
+
+#: ../data/gui/preferences_window.ui.h:98
+msgid "Show systray:"
+msgstr "システムトレイに表示:"
+
+# (Mako)"Ask status message when I:" に続く語
+#: ../data/gui/preferences_window.ui.h:99
+msgid "Sign _in"
+msgstr "サインインしたとき (_i)"
+
+# (Mako)"Ask status message when I:" に続く語
+#: ../data/gui/preferences_window.ui.h:100
+msgid "Sign _out"
+msgstr "サインアウトしたとき (_o)"
+
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"メッセージが装飾(書式や色など)を含んでいる場合があります。チェックをつける"
+"と、Gajim はそのままのメッセージ文を表示します。"
+
+#: ../data/gui/preferences_window.ui.h:103
+msgid "Sort contacts by status"
+msgstr "相手先を在席状況順に並べる"
+
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+msgid "Status"
+msgstr "在席状況"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "Status _iconset:"
+msgstr "状況アイコン (_i):"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Style"
+msgstr "スタイル"
+
+#: ../data/gui/preferences_window.ui.h:107
+msgid "T_heme:"
+msgstr "テーマ (_h):"
+
+#: ../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"
+msgstr ""
+"自動「離席」メッセージ。空にすると、Gajim は現在の状況メッセージを変更しませ"
+"ん。\n"
+"$S は前の状況メッセージに置き換えられます\n"
+"$T は自動離席の設定時間に置き換えられます"
+
+#: ../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 ""
+"自動「不在」メッセージ。空にすると、Gajim は現在の状況メッセージを変更しませ"
+"ん\n"
+"$S は前の状況メッセージに置き換えられます\n"
+"$T は自動不在の設定時間に置き換えられます"
+
+#: ../data/gui/preferences_window.ui.h:114
+msgid "Use _transports icons"
+msgstr "中継先のアイコンを使う (_t)"
+
+#: ../data/gui/preferences_window.ui.h:115
+msgid "Use system _default"
+msgstr "システムのデフォルトを使う (_d)"
+
+#: ../data/gui/preferences_window.ui.h:116
+#, fuzzy
+msgid "Video input device"
+msgstr "デフォルトのメッセージ"
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
+msgid "When new event is received:"
+msgstr "新しいイベントを受信したとき:"
+
+#: ../data/gui/preferences_window.ui.h:119
+#, fuzzy
+msgid "Your message:"
+msgstr "エラーメッセージ: %s"
+
+#: ../data/gui/preferences_window.ui.h:120
+#, fuzzy
+msgid "Your nickname:"
+msgstr "ニックネーム:"
+
+#: ../data/gui/preferences_window.ui.h:121
+msgid "_Away after:"
+msgstr "「離席中」にする (_A):"
+
+#: ../data/gui/preferences_window.ui.h:122
+msgid "_Browser:"
+msgstr "ブラウザ (_B):"
+
+#: ../data/gui/preferences_window.ui.h:123
+msgid "_Display chat state notifications:"
+msgstr "チャット状態通知を表示する (_D):"
+
+#: ../data/gui/preferences_window.ui.h:124
+msgid "_Emoticons:"
+msgstr "感情アイコン (_E):"
+
+#: ../data/gui/preferences_window.ui.h:125
+msgid "_File manager:"
+msgstr "ファイルマネージャ (_F):"
+
+#: ../data/gui/preferences_window.ui.h:126
+msgid "_Highlight misspelled words"
+msgstr "スペル間違いを強調表示する (_H)"
+
+#: ../data/gui/preferences_window.ui.h:127
+msgid "_Ignore events from contacts not in the roster"
+msgstr "名簿にない相手先からのイベントを無視する (_I)"
+
+#: ../data/gui/preferences_window.ui.h:128
+msgid "_Ignore rich content in incoming messages"
+msgstr "受信したメッセージの書式を無視する (_I)"
+
+#: ../data/gui/preferences_window.ui.h:129
+msgid "_Log status changes of contacts"
+msgstr "相手先の状況変更を記録する (_L)"
+
+#: ../data/gui/preferences_window.ui.h:130
+msgid "_Mail client:"
+msgstr "メールクライアント (_M):"
+
+#: ../data/gui/preferences_window.ui.h:131
+msgid "_Not available after:"
+msgstr "「不在」にする (_N):"
+
+#: ../data/gui/preferences_window.ui.h:132
+msgid "_Open..."
+msgstr "開く (_O)..."
+
+#: ../data/gui/preferences_window.ui.h:133
+msgid "_Reset to Default Colors"
+msgstr "デフォルトの色に戻す (_R)"
+
+#: ../data/gui/preferences_window.ui.h:134
+msgid "_Send chat state notifications:"
+msgstr "チャット状態通知を送信する (_S):"
+
+#: ../data/gui/preferences_window.ui.h:135
+msgid "_Status message:"
+msgstr "状況メッセージ (_S):"
+
+# (Mako)あえてカッコ書き
+#: ../data/gui/preferences_window.ui.h:136
+msgid "_URL highlight:"
+msgstr "URL 強調表示 (_U):"
+
+#: ../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)"
+
+#: ../data/gui/preferences_window.ui.h:139
+#, fuzzy
+msgid "in _roster"
+msgstr "名簿にありません"
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "minutes"
+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: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
+msgid "Active for this session"
+msgstr ""
+
+#: ../data/gui/privacy_list_window.ui.h:5
+#, fuzzy
+msgid "Active on each startup"
+msgstr "Gajim 起動時に接続する (_o)"
+
+#: ../data/gui/privacy_list_window.ui.h:6
+msgid "All"
+msgstr "すべて"
+
+#: ../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
+msgid "Deny"
+msgstr "拒否する"
+
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "JabberID"
+msgstr "JabberID"
+
+#: ../data/gui/privacy_list_window.ui.h:11
+#, fuzzy
+msgid "Order:"
+msgstr "順位:"
+
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
+msgid "Privacy List"
+msgstr "プライバシーリスト"
+
+#: ../data/gui/privacy_list_window.ui.h:13
+#, fuzzy
+msgid "all by subscription"
+msgstr "在席通知のすべて"
+
+#: ../data/gui/privacy_list_window.ui.h:14
+#, fuzzy
+msgid "all in the group"
+msgstr "グループのすべて"
+
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "相互に承認"
+
+# #(Mako)helpers.pyは、
+# 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "こちらが承認"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "1"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "2"
+
+#: ../data/gui/privacy_list_window.ui.h:19
+#, fuzzy
+msgid "to send me messages"
+msgstr "メッセージを私に送信する"
+
+#: ../data/gui/privacy_list_window.ui.h:20
+#, fuzzy
+msgid "to send me queries"
+msgstr "クエリーを私に送信する"
+
+#: ../data/gui/privacy_list_window.ui.h:21
+#, fuzzy
+msgid "to send me status"
+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
+msgid "<b>Address</b>"
+msgstr "<b>住所</b>"
+
+#: ../data/gui/profile_window.ui.h:2
+msgid "<b>Avatar:</b>"
+msgstr "<b>アバター:</b>"
+
+#: ../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/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/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/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
+msgid "<b>Extra Address:</b>"
+msgstr "<b>建物名など:</b>"
+
+#. Family 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/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
+msgid "<b>Full Name</b>"
+msgstr "<b>名前(フルネーム)</b>"
+
+#. Given Name
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
+msgid "<b>Given:</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>"
+
+#. 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/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
+msgid "<b>Name:</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/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
+msgid "<b>Phone No.:</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/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
+msgid "<b>Postal Code:</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>Prefix:</b>"
+
+# (Mako)個人情報では「役」(劇の役のような意味で)、
+#       vcard では「職種」が適切と思われる。
+#: ../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>役/職種:</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/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Street:</b>"
+msgstr "<b>町丁名・番地:</b>"
+
+#. 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>"
+
+#. "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/profile_window.ui.h:32
+msgid "Click to set your avatar"
+msgstr "アバターの設定"
+
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
+msgid "Format: YYYY-MM-DD"
+msgstr "書式: YYYY-MM-DD"
+
+#: ../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
+msgid "Work"
+msgstr "職業"
+
+#: ../data/gui/remove_account_window.ui.h:1
+msgid "<b>What do you want to do?</b>"
+msgstr "<b>あなたがやりたいことは ?</b>"
+
+#: ../data/gui/remove_account_window.ui.h:2
+#, fuzzy
+msgid "Remove account _only from Gajim"
+msgstr "アカウントを Gajim からのみ削除 (_o)"
+
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "Remove account from Gajim and from _server"
+msgstr "アカウントを Gajim とサーバーからも削除 (_s)"
+
+#. 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
+msgid "_Remove"
+msgstr "削除 (_R)"
+
+#: ../data/gui/roster_item_exchange_window.ui.h:1
+#, fuzzy
+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
+#, fuzzy
+msgid "Roster Item Exchange"
+msgstr "名簿の項目の交換"
+
+# (Mako)ほかの項目との並びで、バランスを考えてあえてカッコでつけ加えている
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
+msgid "_OK"
+msgstr "OK (_O)"
+
+#: ../data/gui/roster_window.ui.h:1
+msgid "Frequently Asked Questions (online)"
+msgstr "よくある質問(オンライン)"
+
+#: ../data/gui/roster_window.ui.h:3
+msgid "Help online"
+msgstr "ヘルプ(オンライン)"
+
+#: ../data/gui/roster_window.ui.h:4
+msgid "Show Only _Active Contacts"
+msgstr "アクティブな相手先のみ表示 (_A)"
+
+#: ../data/gui/roster_window.ui.h:5
+msgid "Show Trans_ports"
+msgstr "中継先を表示 (_p)"
+
+#: ../data/gui/roster_window.ui.h:6
+msgid "Show _Offline Contacts"
+msgstr "オフラインの相手先を表示 (_O)"
+
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
+msgid "Show _Roster"
+msgstr "名簿の表示 (_R)"
+
+#. 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 "操作 (_A)"
+
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
+msgid "_Edit"
+msgstr "編集 (_E)"
+
+#: ../data/gui/roster_window.ui.h:11
+msgid "_Help"
+msgstr "ヘルプ (_H)"
+
+#: ../data/gui/roster_window.ui.h:12
+msgid "_View"
+msgstr "表示 (_V)"
+
+#: ../data/gui/search_window.ui.h:1
+msgid "Please wait while retrieving search form..."
+msgstr "しばらくお待ちください…"
+
+#: ../data/gui/search_window.ui.h:2
+msgid "Search"
+msgstr "検索"
+
+#: ../data/gui/search_window.ui.h:3
+#, fuzzy
+msgid "_Add contact"
+msgstr "相手先リストに追加する (_A)..."
+
+#. Information
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
+msgid "_Information"
+msgstr "情報 (_I)"
+
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
+msgid "_Search"
+msgstr "検索 (_S)"
+
+#: ../data/gui/service_discovery_window.ui.h:1
+msgid "G_o"
+msgstr "実行 (_o)"
+
+#: ../data/gui/service_discovery_window.ui.h:2
+msgid "_Address:"
+msgstr "アドレス (_A):"
+
+#: ../data/gui/service_registration_window.ui.h:1
+#, fuzzy
+msgid "Register to"
+msgstr "登録"
+
+#: ../data/gui/service_registration_window.ui.h:2
+msgid "_Cancel"
+msgstr "中止 (_C)"
+
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "差出人:"
+
+#: ../data/gui/single_message_window.ui.h:3
+msgid "Reply to this message"
+msgstr "このメッセージへの返信"
+
+#: ../data/gui/single_message_window.ui.h:4
+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 "Subject:"
+msgstr "件名:"
+
+#: ../data/gui/single_message_window.ui.h:8
+msgid "To:"
+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/subscription_request_window.ui.h:1
+msgid "Au_thorize"
+msgstr "承認する (_t)"
+
+#: ../data/gui/subscription_request_window.ui.h:2
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr "承認すると、あなたが接続したときに相手先はそのことを知ることができます"
+
+#: ../data/gui/subscription_request_window.ui.h:3
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"承認しないと、あなたが接続したときに相手先はそのことを知ることができません"
+
+#: ../data/gui/subscription_request_window.ui.h:4
+msgid "Subscription Request"
+msgstr "在席通知の申し込み"
+
+#: ../data/gui/subscription_request_window.ui.h:7
+msgid "_Deny"
+msgstr "拒否する (_D)"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
+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
+#, fuzzy
+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 "Show All Pending _Events"
+msgstr "すべての保留イベントの表示 (_E)"
+
+# (Mako)pending の意味か
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:3
+msgid "<b>Ask:</b>"
+msgstr "<b>保留中の申し込み:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:6
+msgid "<b>Client:</b>"
+msgstr "<b>クライアント:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:8
+msgid "<b>Contact time:</b>"
+msgstr "<b>通話時間:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Jabber ID:</b>"
+msgstr "<b>Jabber ID:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>Resource:</b>"
+msgstr "<b>リソース:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:32
+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:38
+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:42
+#, fuzzy
+msgid "Configured avatar:"
+msgstr "設定したアバター:"
+
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact"
+msgstr "相手先"
+
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "Contact Information"
+msgstr "相手先の情報"
+
+#: ../data/gui/vcard_information_window.ui.h:46
+msgid "More"
+msgstr "その他の情報"
+
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "User avatar:"
+msgstr "ユーザーのアバター:"
+
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>フォント</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
+#, fuzzy
+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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
+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"
+
+# (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/zeroconf_information_window.ui.h:6
+msgid "Local jid:"
+msgstr "ローカル jid:"
+
+#: ../data/gui/zeroconf_information_window.ui.h:7
+msgid "Personal"
+msgstr "個人"
+
+#: ../data/gui/zeroconf_information_window.ui.h:8
+msgid "Resource:"
+msgstr "リソース:"
+
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Status:"
+msgstr "在席状況:"
+
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber クライアント"
@@ -71,7 +2807,7 @@ msgstr "整数型"
 msgid "Text"
 msgstr "文字列型"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:902
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "色"
 
@@ -104,10 +2840,6 @@ msgid_plural "You have received new entries (and %d not displayed):"
 msgstr[0] "新しいエントリーを受け取りました (%(count)d が表示されません):"
 msgstr[1] "新しいエントリーを受け取りました (%(count)d が表示されません):"
 
-#: ../src/atom_window.py:124
-msgid "You have received new entry:"
-msgstr "新しいエントリーを受け取りました:"
-
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
@@ -213,61 +2945,53 @@ msgstr "スウェーデン語"
 msgid "Chinese (Ch)"
 msgstr "中国語 (Ch)"
 
-#: ../src/chat_control.py:447
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "スペルチェックの言語"
 
 #. we are not connected
-#: ../src/chat_control.py:479 ../src/chat_control.py:690
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "接続は有効ではありません"
 
-#: ../src/chat_control.py:480 ../src/chat_control.py:691
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr "接続するまでメッセージは送信されません。"
 
-#: ../src/chat_control.py:882
-msgid "Bold"
-msgstr "太字にする"
-
-#: ../src/chat_control.py:883
-msgid "Italic"
-msgstr "イタリック"
-
-#: ../src/chat_control.py:884
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "下線"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "抹消線"
 
-#: ../src/chat_control.py:908
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "フォント"
 
-#: ../src/chat_control.py:917
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "書式のクリア"
 
-#: ../src/chat_control.py:995
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "ファイルを送信しますか ?"
 
-#: ../src/chat_control.py:996
+#: ../src/chat_control.py:997
 #, 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:1449 ../src/chat_control.py:1943
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "GPG 暗号化は有効"
 
 #. Add to roster
-#: ../src/chat_control.py:1474 ../src/common/contacts.py:158
+#: ../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
@@ -278,30 +3002,30 @@ msgstr "GPG 暗号化は有効"
 msgid "Not in Roster"
 msgstr "名簿にありません"
 
-#: ../src/chat_control.py:1518
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "この相手先はファイル転送をサポートしていません。"
 
-#: ../src/chat_control.py:1521
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "ファイル転送を行なうには、本当の JID を知っている必要があります。"
 
-#: ../src/chat_control.py:1610
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1808
+#: ../src/chat_control.py:1812
 #, 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:1923 ../src/dialogs.py:4814
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "GPG 鍵が割り当てられていません"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -309,52 +3033,52 @@ msgstr ""
 "この相手先に GPG 鍵が割り当てられていないため、メッセージを GPG で暗号化する"
 "ことができません。"
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG 暗号化は無効"
 
-#: ../src/chat_control.py:1959
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "セッションは記録されます"
 
-#: ../src/chat_control.py:1961
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "セッションは記録されません"
 
 # (Mako)暗号化は有効 %s、
 #. encryption %s active
-#: ../src/chat_control.py:1978
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "で"
 
-#: ../src/chat_control.py:1978
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "でなく"
 
 # #. チャットは記録 %s。
 #. chat session %s be logged
-#: ../src/chat_control.py:1980
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "記録されます"
 
-#: ../src/chat_control.py:1980
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "記録されません"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1984
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "認証されています"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1988
+#: ../src/chat_control.py:1992
 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:1995
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -363,23 +3087,23 @@ msgstr ""
 "%(type)s の暗号化は有効%(status)s、%(authenticated)s。\n"
 "チャットは%(logged)s。"
 
-#: ../src/chat_control.py:2135
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2144
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "このセッションは暗号化されています"
 
-#: ../src/chat_control.py:2147
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " かつ、記録されます"
 
-#: ../src/chat_control.py:2149
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " かつ、記録されません"
 
-#: ../src/chat_control.py:2154
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -387,32 +3111,32 @@ msgstr ""
 "遠くの相手先の同一性は検証されませんでした。詳しくは盾ボタンをクリックしてく"
 "ださい。"
 
-#: ../src/chat_control.py:2156
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "終端間暗号化 (E2EE) は無効"
 
-#: ../src/chat_control.py:2193 ../src/chat_control.py:2206
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "次のメッセージは暗号化されませんでした:"
 
-#: ../src/chat_control.py:2199
+#: ../src/chat_control.py:2203
 msgid "The following message was encrypted"
 msgstr "次のメッセージは暗号化されました:"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2471
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" さんから新しいメッセージを受信しました"
 
-#: ../src/chat_control.py:2472
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 "このタブを閉じると、記録を残さない設定の場合、このメッセージは失われます。"
 
-#: ../src/chat_control.py:2615 ../src/common/connection_handlers.py:1578
+#: ../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
@@ -420,7 +3144,7 @@ msgstr ""
 msgid "Database Error"
 msgstr "データベースのエラー"
 
-#: ../src/chat_control.py:2616
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -429,7 +3153,7 @@ msgstr ""
 "データベースファイル (%s) を読むことができません。修復するか、または削除(すべ"
 "ての履歴は失われます)してください。"
 
-#: ../src/chat_control.py:2854
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s さんは現在、%(status)s"
@@ -489,10 +3213,6 @@ msgstr "チャットできます"
 msgid "Online"
 msgstr "オンライン"
 
-#: ../src/common/commands.py:106 ../src/common/helpers.py:233
-msgid "Away"
-msgstr "離席中です"
-
 #: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "長時間不在です"
@@ -640,7 +3360,7 @@ 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:3369
+#: ../src/common/optparser.py:517 ../src/gui_interface.py:3370
 msgid "default"
 msgstr "デフォルト"
 
@@ -1524,12 +4244,12 @@ msgstr "%(agent)s の登録は失敗しました。%(error)s: %(error_msg)s"
 msgid "Disk Write Error"
 msgstr "ディスクの書き込みエラー"
 
-#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1456
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "「隠れています」はサポートされていません"
 
-#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1457
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, fuzzy, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "アカウント %s は「隠れています」をサポートしていません。"
@@ -1803,77 +4523,77 @@ msgstr ""
 "件名: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:790
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "アカウント \"%s\" での接続が切れました"
 
-#: ../src/common/connection.py:791
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "手動で再接続してください。"
 
-#: ../src/common/connection.py:803
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:837
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:850
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知の SSL エラー: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:865
+#: ../src/common/connection.py:864
 #, fuzzy
 msgid "Invalid answer"
 msgstr "回答が間違っています"
 
-#: ../src/common/connection.py:866
+#: ../src/common/connection.py:865
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:1147 ../src/common/connection.py:1276
-#: ../src/common/connection.py:1767
-#: ../src/common/zeroconf/connection_zeroconf.py:191
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "%s に接続できませんでした"
 
-#: ../src/common/connection.py:1148 ../src/gui_interface.py:754
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "設定を確認するか、時間をおいて試してください。"
 
-#: ../src/common/connection.py:1153
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "サーバの応答: %s"
 
-#: ../src/common/connection.py:1166
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "プロキシへの接続に失敗"
 
-#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "アカウント %s に接続できません"
 
-#: ../src/common/connection.py:1198 ../src/common/connection.py:1257
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "アカウント %s での接続が切れました。再接続を試みます。"
 
-#: ../src/common/connection.py:1223
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "%s の証明書の真正性は検証できませんでした。"
 
-#: ../src/common/connection.py:1226
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -1882,7 +4602,7 @@ msgstr ""
 "\n"
 "SSL エラー: <b>%s</b>"
 
-#: ../src/common/connection.py:1228
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -1891,25 +4611,25 @@ msgstr ""
 "\n"
 "未知の SSL エラー: %d"
 
-#: ../src/common/connection.py:1277
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "接続を確認するか、または後で再度試してください"
 
 # (Mako) %s はアカウントか
-#: ../src/common/connection.py:1308
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" の認証に失敗しました"
 
-#: ../src/common/connection.py:1310
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "整合性のために、ログインとパスワードを確認してください。"
 
-#: ../src/common/connection.py:1379
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "プライバシーリストを削除する際のエラー"
 
-#: ../src/common/connection.py:1380
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -1918,25 +4638,25 @@ msgstr ""
 "プライバシーリスト %s は削除されませんでした。現在の接続に使用されているよう"
 "です。使用をやめてから再び試してください。"
 
-#: ../src/common/connection.py:1633
+#: ../src/common/connection.py:1632
 #, fuzzy, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "送った相手先: %s (%s)"
 
-#: ../src/common/connection.py:1636
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "送った相手先:"
 
-#: ../src/common/connection.py:1782 ../src/common/connection.py:1805
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2220
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "登録解除に失敗"
 
-#: ../src/common/connection.py:2221
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "サーバー %(server)s での登録解除に失敗しました: %(error)s"
@@ -1956,14 +4676,6 @@ msgstr "オブザーバ"
 msgid "Transports"
 msgstr "中継先"
 
-#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
-#. General group cannot be changed
-#: ../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 "全般"
-
 #: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "名簿にありません"
@@ -2216,10 +4928,6 @@ msgstr "取り込み中です"
 msgid "_Not Available"
 msgstr "不在 (_N)"
 
-#: ../src/common/helpers.py:216
-msgid "Not Available"
-msgstr "不在です"
-
 #: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "チャット可 (_F)"
@@ -2259,10 +4967,6 @@ msgstr "オフラインです"
 msgid "_Invisible"
 msgstr "隠れ中 (_I)"
 
-#: ../src/common/helpers.py:243
-msgid "Invisible"
-msgstr "隠れています"
-
 #: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "不明"
@@ -2280,13 +4984,6 @@ msgstr "なし"
 msgid "To"
 msgstr "相手先が承認"
 
-# #(Mako)helpers.pyは、
-# 相手先の情報で、subscriptionの有無なので、「こちらが承認」としたい
-#: ../src/common/helpers.py:258
-#, fuzzy
-msgid "From"
-msgstr "こちらが承認"
-
 #: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "相互に承認"
@@ -2438,32 +5135,21 @@ msgid_plural "%d events pending"
 msgstr[0] "保留イベント %d 件"
 msgstr[1] "保留イベント %d 件"
 
-#. No configured account
-#: ../src/common/helpers.py:1159 ../src/common/helpers.py:1171
-#: ../src/notify.py:553 ../src/notify.py:574 ../src/notify.py:612
-#: ../src/notify.py:624
-msgid "Gajim"
-msgstr "Gajim"
-
 #: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1339
-msgid "I would like to add you to my contact list."
-msgstr "あなたを私の相手先リストに追加したいと思います。"
-
 #: ../src/common/helpers.py:1341
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:102
+#: ../src/common/jingle_rtp.py:106
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "談話室の構成"
 
-#: ../src/common/jingle_rtp.py:103
+#: ../src/common/jingle_rtp.py:107
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -2475,19 +5161,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:295
+#: ../src/common/jingle_rtp.py:299
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:298
+#: ../src/common/jingle_rtp.py:302
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:327
+#: ../src/common/jingle_rtp.py:331
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:339
 msgid "video output"
 msgstr ""
 
@@ -2501,60 +5187,60 @@ msgstr "\"%(command)s\" の実行中にエラー: %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s は正しいログレベルではありません"
 
-#: ../src/common/multimedia_helpers.py:36
+#: ../src/common/multimedia_helpers.py:37
 #, fuzzy
 msgid " Default device"
 msgstr "デフォルトのメッセージ"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:52
+#: ../src/common/multimedia_helpers.py:53
 msgid "Audio test"
 msgstr ""
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:55
-#: ../src/common/multimedia_helpers.py:68
-#: ../src/common/multimedia_helpers.py:81
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:56
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:82
+#: ../src/common/multimedia_helpers.py:99
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:70
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "サイズ: %s"
 
 #. Fake sink
 #. Fake video output
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:78
+#: ../src/common/multimedia_helpers.py:79
 msgid "Video test"
 msgstr ""
 
-#. V4L2 src ; TODO: Figure out why it doesn't work
-#: ../src/common/multimedia_helpers.py:83
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
 #. Auto sink
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:96
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:97
+#: ../src/common/multimedia_helpers.py:98
 msgid "X Window System (without Xv)"
 msgstr ""
 
@@ -3057,10 +5743,6 @@ msgstr "シャワー"
 msgid "Having an Appointment"
 msgstr "約束あり"
 
-#: ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "活動停止中"
-
 #: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "休み"
@@ -3251,11 +5933,11 @@ msgstr ""
 "[暗号化セッションの途中です。このメッセージを見ているということは、何か失敗し"
 "ています。]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:180
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Avahi エラー"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -3264,44 +5946,44 @@ msgstr ""
 "%s\n"
 "ローカルの伝送がうまく働いていないようです。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Avahi か Bonjour がインストールされているか確認してください。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:201
-#: ../src/common/zeroconf/connection_zeroconf.py:205
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "ローカルのサービスを起動できません"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "ポート %d を開けません。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:206
-#: ../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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "avahi-daemon が起動しているか確認してください。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:284
-#: ../src/common/zeroconf/connection_zeroconf.py:295
-#: ../src/common/zeroconf/connection_zeroconf.py:309
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "アカウント \"%s\" の在席状況を変更できませんでした"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:326
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "メッセージを送信できませんでした。"
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:336
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 msgid "Contact is offline. Your message could not be sent."
 msgstr "相手先はオフラインです。メッセージを送信できませんでした。"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:361
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr "ホストへの接続を確立できませんでした: データ送信中の時間切れです。"
@@ -3312,14 +5994,6 @@ msgstr "ホストへの接続を確立できませんでした: データ送信�
 msgid "Error while adding service. %s"
 msgstr "サービスの追加中のエラーです。%s"
 
-#: ../src/config.py:170 ../src/config.py:653
-msgid "Disabled"
-msgstr "無効"
-
-#: ../src/config.py:391
-msgid "Status"
-msgstr "在席状況"
-
 #: ../src/config.py:397
 msgid "Default Message"
 msgstr "デフォルトのメッセージ"
@@ -3350,15 +6024,6 @@ msgstr "状況メッセージのタイトル"
 msgid "status message text"
 msgstr "状況メッセージの文"
 
-#: ../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 "なし"
-
 #. 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
@@ -3378,18 +6043,6 @@ msgstr "すべての変更を直ちに有効にするには、再ログインし
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP はこのコンピュータでは使えません。"
 
-#: ../src/config.py:1748 ../src/config.py:2301
-msgid "No key selected"
-msgstr "鍵が選択されていません"
-
-#: ../src/config.py:1765
-msgid "Server:"
-msgstr "サーバー:"
-
-#: ../src/config.py:1775 ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
 #: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "未読のイベント"
@@ -3762,11 +6415,11 @@ msgstr "このアカウントを編集するには、ユーザー名を指定し
 msgid "Please provide a server on which you want to register."
 msgstr "登録したいサーバーを指定してください。"
 
-#: ../src/config.py:3581 ../src/gui_interface.py:1887
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "証明書はファイルにあります"
 
-#: ../src/config.py:3582 ../src/gui_interface.py:1888
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "この証明書は既にファイル %s にあります。再び追加することはできません。"
@@ -3786,7 +6439,7 @@ msgstr ""
 "SSL エラー: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: ../src/config.py:3661 ../src/gui_interface.py:1915
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -4115,7 +6768,7 @@ msgstr "アカウント %(account)s に対して、%(jid)s さんからの在席
 msgid "Subscription request from %s"
 msgstr "%s さんから在席通知の申し込み"
 
-#: ../src/dialogs.py:2122 ../src/gui_interface.py:2671
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "既にグループチャット %s に参加しています。"
@@ -4129,10 +6782,6 @@ msgstr "接続しないと、グループチャットに参加できません。
 msgid "Join Group Chat with account %s"
 msgstr "アカウント %s でグループチャットに参加"
 
-#: ../src/dialogs.py:2171
-msgid "Join Group Chat"
-msgstr "グループチャットに参加"
-
 #: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "アカウントが正しくありません"
@@ -4247,60 +6896,60 @@ msgid "The passwords typed in both fields must be identical."
 msgstr "ふたつの欄のパスワードは同一でなければなりません。"
 
 #. default value
-#: ../src/dialogs.py:2610 ../src/notify.py:263 ../src/notify.py:499
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "相手先がサインインしました"
 
-#: ../src/dialogs.py:2612 ../src/notify.py:271 ../src/notify.py:501
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "相手先がサインアウトしました"
 
 #. chat message
-#: ../src/dialogs.py:2614 ../src/notify.py:292 ../src/notify.py:344
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "新着メッセージ"
 
 #. single message
-#: ../src/dialogs.py:2614 ../src/notify.py:275 ../src/notify.py:345
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "新着の単発メッセージ"
 
 #. private message
-#: ../src/dialogs.py:2615 ../src/notify.py:281 ../src/notify.py:345
-#: ../src/notify.py:504
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "新着の私信"
 
-#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:513
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "新着メール"
 
-#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:506
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "ファイル転送の要求"
 
 #: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
-#: ../src/gui_interface.py:1374 ../src/notify.py:508
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "ファイル転送のエラー"
 
 #: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
 #: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
-#: ../src/notify.py:510
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "ファイルの転送の完了"
 
-#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:511
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "ファイルの転送の中断"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:515
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "グループチャットへの招待"
 
-#: ../src/dialogs.py:2626 ../src/notify.py:255 ../src/notify.py:517
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "相手先が在席状況を変更"
 
@@ -4429,10 +7078,6 @@ msgstr "プライバシーリスト <b><i>%s</i></b>"
 msgid "Privacy List for %s"
 msgstr "%s のプライバシーリスト"
 
-#: ../src/dialogs.py:3428
-msgid "Privacy List"
-msgstr "プライバシーリスト"
-
 #: ../src/dialogs.py:3482
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
@@ -4521,11 +7166,6 @@ msgstr "%s が次のようになったとき:"
 msgid "Adding Special Notification for %s"
 msgstr "%s の特別通知の追加"
 
-#. # means number
-#: ../src/dialogs.py:4132
-msgid "#"
-msgstr "#"
-
 #: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "状態"
@@ -4712,18 +7352,6 @@ msgstr "コマンド実行 (_E)"
 msgid "Re_gister"
 msgstr "登録 (_g)"
 
-#: ../src/disco.py:1343 ../src/disco.py:1787
-msgid "_Join"
-msgstr "参加 (_J)"
-
-#: ../src/disco.py:1355
-msgid "_Search"
-msgstr "検索 (_S)"
-
-#: ../src/disco.py:1504
-msgid "_Edit"
-msgstr "編集 (_E)"
-
 #: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
@@ -4748,20 +7376,20 @@ msgstr "Id"
 msgid "_Bookmark"
 msgstr "ブックマーク (_B)"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3179
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "既にブックマーク"
 
-#: ../src/disco.py:1819 ../src/gui_interface.py:3180
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "グループチャット \"%s\" は既にブックマークにあります。"
 
-#: ../src/disco.py:1828 ../src/gui_interface.py:3194
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "ブックマークが追加されました"
 
-#: ../src/disco.py:1829 ../src/gui_interface.py:3195
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "ブックマークは、名簿の「アクション」メニューから管理できます。"
 
@@ -4999,10 +7627,6 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "python-docutils が必要です。"
 
-#: ../src/features_window.py:104
-msgid "Audio / Video"
-msgstr ""
-
 #: ../src/features_window.py:105
 msgid "Ability to start audio and video chat."
 msgstr ""
@@ -5097,10 +7721,6 @@ msgstr "ファイルの転送が中断しました"
 msgid "Choose File to Send..."
 msgstr "転送するファイルを選択..."
 
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "送信 (_S)"
-
 #: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "説明: "
@@ -5714,6 +8334,10 @@ msgstr ""
 "詳しくは \"%(basename)s help %(command)s\" と入力してください"
 
 #: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "uri が間違っています"
 
@@ -5872,7 +8496,7 @@ msgid "%s has joined the group chat"
 msgstr "%s さんが参加しました"
 
 #: ../src/groupchat_control.py:1460 ../src/gui_interface.py:945
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../src/history_window.py:442 ../src/notify.py:252
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s さんは現在 %(status)s"
@@ -5888,8 +8512,8 @@ msgid ""
 msgstr "このウィンドウを閉じると、このグループチャットから切断されます。"
 
 #: ../src/groupchat_control.py:1694 ../src/gui_interface.py:1200
-#: ../src/gui_interface.py:1975 ../src/gui_interface.py:2012
-#: ../src/gui_interface.py:2047 ../src/message_window.py:222
+#: ../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"
@@ -6043,7 +8667,7 @@ msgstr "アカウント %s への申し込みを承認しますか ?"
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "%(url)s に対する HTTP (%(method)s) の承認 (id: %(id)s)"
 
-#: ../src/gui_interface.py:212 ../src/notify.py:519
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "接続に失敗しました"
 
@@ -6058,7 +8682,7 @@ msgstr "エラー %(code)s: %(msg)s"
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "%(message)s を送信する際にエラー ( %(error)s )"
 
-#: ../src/gui_interface.py:662 ../src/notify.py:521
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "在席通知申込"
 
@@ -6084,7 +8708,7 @@ msgstr ""
 "この相手先を常にオフラインとして見ることになります。\n"
 "相手先一覧から削除しますか ?"
 
-#: ../src/gui_interface.py:726 ../src/notify.py:523
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "在席通知の取り消し"
 
@@ -6287,21 +8911,21 @@ msgstr ""
 "てください"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1801
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s さんがファイルを転送したがっています。"
 
-#: ../src/gui_interface.py:1804
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "ファイル転送の要求"
 
-#: ../src/gui_interface.py:1910
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "SSL 証明書の検証エラー"
 
-#: ../src/gui_interface.py:1911
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -6311,15 +8935,15 @@ msgstr ""
 "jabber サーバーの SSL 証明書の検証にエラーがあります: %(error)s\n"
 "それでもこのサーバーに接続しますか ?"
 
-#: ../src/gui_interface.py:1919
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "この証明書のこのエラーを無視します。"
 
-#: ../src/gui_interface.py:1939
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "SSL 証明書エラー"
 
-#: ../src/gui_interface.py:1940
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -6336,12 +8960,12 @@ msgstr ""
 "\n"
 "それでも接続して、証明書の指紋を更新しますか ?"
 
-#: ../src/gui_interface.py:1970 ../src/gui_interface.py:2007
-#: ../src/gui_interface.py:2043
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "安全でない接続"
 
-#: ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -6351,12 +8975,12 @@ msgstr ""
 "安全でない接続でパスワードを送ろうとしています。それを避けるには PyOpenSSL を"
 "インストールすべきです。あなたがやりたいことですか ?"
 
-#: ../src/gui_interface.py:1974 ../src/gui_interface.py:2011
-#: ../src/gui_interface.py:2046
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "はい。安全でないまま接続したいです"
 
-#: ../src/gui_interface.py:2008
+#: ../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?"
@@ -6364,7 +8988,7 @@ msgstr ""
 "安全でない接続でパスワードを送ろうとしています。それを避けるには PyOpenSSL を"
 "インストールすべきです。あなたがやりたいことですか ?"
 
-#: ../src/gui_interface.py:2044
+#: ../src/gui_interface.py:2043
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -6373,22 +8997,22 @@ msgstr ""
 "暗号化されていない接続でパスワードを送ろうとしています。あなたがやりたいこと"
 "ですか ?"
 
-#: ../src/gui_interface.py:2065
+#: ../src/gui_interface.py:2064
 #, fuzzy
 msgid "PEP node was not removed"
 msgstr "PEP node was not removed"
 
-#: ../src/gui_interface.py:2066
+#: ../src/gui_interface.py:2065
 #, fuzzy, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP node %(node)s was not removed: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2623 ../src/gui_interface.py:2646
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "感情アイコンは無効"
 
-#: ../src/gui_interface.py:2624
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -6396,7 +9020,7 @@ msgstr ""
 "指定された感情アイコンのテーマは見つかりません。そのため、感情アイコンは無効"
 "です。"
 
-#: ../src/gui_interface.py:2647
+#: ../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 "
@@ -6406,42 +9030,42 @@ msgstr ""
 "ルの書式を更新する必要があるかも知れません。詳しくは http://trac.gajim.org/"
 "wiki/Emoticons をご覧ください。"
 
-#: ../src/gui_interface.py:2678 ../src/roster_window.py:3557
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:3055
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "設定を保存できませんでした"
 
-#: ../src/gui_interface.py:3591
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "パスフレーズが必要です"
 
-#: ../src/gui_interface.py:3592
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "鍵ID %(keyid)s (アカウント %(account)s) の GPG 鍵のパスフレーズを入力してくだ"
 "さい。"
 
-#: ../src/gui_interface.py:3606
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG 鍵は失効しています"
 
-#: ../src/gui_interface.py:3607
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "GPG 鍵は失効しています。OpenPGP なしに %s さんに接続します。"
 
 #. ask again
-#: ../src/gui_interface.py:3616
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "パスフレーズが間違っています"
 
-#: ../src/gui_interface.py:3617
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "GPG のパスフレーズをもういちど入力するか、または「中止」を押してください。"
@@ -6480,11 +9104,6 @@ msgstr "ニックネーム"
 msgid "Message"
 msgstr "メッセージ"
 
-#. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
-msgid "Subject"
-msgstr "題"
-
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -6532,10 +9151,6 @@ msgstr[1] "本当に、選択したメッセージを削除してもいいです
 msgid "Conversation History with %s"
 msgstr "%s さんとの会話の履歴"
 
-#: ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "会話の履歴"
-
 #: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "ディスクのエラー"
@@ -6604,47 +9219,47 @@ msgstr "- メッセージは記録されます"
 msgid "- messages will not be logged"
 msgstr "- メッセージは記録されません"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s さんの在席状況が変わりました"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s さんがサインインしました"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s さんがサインアウトしました"
 
-#: ../src/notify.py:277
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "%(nickname)s からの新しい単発メッセージ"
 
-#: ../src/notify.py:284
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "グループチャット %s からの新着の私信"
 
-#: ../src/notify.py:286
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s さん: %(message)s"
 
-#: ../src/notify.py:289
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "%(nickname)s さんからのメッセージ"
 
-#: ../src/notify.py:294
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "%(nickname)s さんからの新着メッセージ"
 
-#: ../src/notify.py:561
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "無視する"
 
@@ -7057,38 +9672,6 @@ msgstr "すべてのユーザーに"
 msgid "To all online users"
 msgstr "オンラインのすべてのユーザーに"
 
-#. Invite to
-#. Invite to Groupchat
-#: ../src/roster_window.py:5281 ../src/roster_window.py:5441
-msgid "In_vite to"
-msgstr "招待 (_v)"
-
-#: ../src/roster_window.py:5291 ../src/roster_window.py:5530
-msgid "Send Cus_tom Status"
-msgstr "個別の在席状況の送信 (_t)"
-
-#. Rename
-#: ../src/roster_window.py:5326
-msgid "Re_name"
-msgstr "名前の変更 (_n)"
-
-#: ../src/roster_window.py:5345 ../src/roster_window.py:5473
-#: ../src/roster_window.py:5606
-msgid "_Unblock"
-msgstr "拒否の解除 (_U)"
-
-#: ../src/roster_window.py:5353 ../src/roster_window.py:5479
-#: ../src/roster_window.py:5609
-msgid "_Block"
-msgstr "拒否 (_B)"
-
-#. Remove group
-#. Remove
-#: ../src/roster_window.py:5363 ../src/roster_window.py:5489
-#: ../src/roster_window.py:5619
-msgid "_Remove"
-msgstr "削除 (_R)"
-
 #. Manage Transport submenu
 #: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
@@ -7124,11 +9707,6 @@ msgstr "中継先の変更 (_M)"
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
-#. Information
-#: ../src/roster_window.py:5631
-msgid "_Information"
-msgstr "情報 (_I)"
-
 # (Mako)ここでは「復元」の意味か
 #: ../src/roster_window.py:5653
 msgid "_Maximize"
@@ -7142,10 +9720,6 @@ msgstr "再接続 (_R)"
 msgid "_Disconnect"
 msgstr "切断 (_D)"
 
-#: ../src/roster_window.py:5680
-msgid "_History"
-msgstr "履歴 (_H)"
-
 #. History manager
 #: ../src/roster_window.py:5751
 msgid "History Manager"
@@ -7224,10 +9798,6 @@ msgstr "状況メッセージを変更する (_C)..."
 msgid "Hide _Roster"
 msgstr "名簿で (_r)"
 
-#: ../src/statusicon.py:326
-msgid "Show _Roster"
-msgstr "名簿の表示 (_R)"
-
 #: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "このメニューを表示しない"
@@ -7284,14 +9854,6 @@ msgstr "在席通知の承認: "
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:652
-msgid "Mood:"
-msgstr "気分:"
-
-#: ../src/tooltips.py:657
-msgid "Activity:"
-msgstr "動向:"
-
 #: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "楽曲:"
@@ -7372,12 +9934,6 @@ msgstr "不明"
 msgid "since %s"
 msgstr "%s から"
 
-# (Mako)個人情報では「役」(劇の役のような意味で)、
-#       vcard では「職種」が適切と思われる。
-#: ../src/vcard.py:331
-msgid "<b>Role:</b>"
-msgstr "<b>役/職種:</b>"
-
 #: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>分掌:</b>"
@@ -7424,9 +9980,6 @@ msgstr " リソース。優先順位は "
 #~ msgid "Join _Group Chat..."
 #~ msgstr "グループチャットに参加する (_G)..."
 
-#~ msgid "_Add Contact..."
-#~ msgstr "相手先リストに追加する (_A)..."
-
 #~ msgid "_Discover Services"
 #~ msgstr "サービスを探索する (_D)"
 
@@ -7436,9 +9989,6 @@ msgstr " リソース。優先順位は "
 #~ msgid "_Modify Account"
 #~ msgstr "アカウントを修正する (_M)"
 
-#~ msgid "_Open Gmail Inbox"
-#~ msgstr "Gmail の受信箱を開く (_O)"
-
 #~ msgid "_Personal Events"
 #~ msgstr "個人イベント (_P)"
 
@@ -7448,120 +9998,9 @@ msgstr " リソース。優先順位は "
 #~ msgid "_Status"
 #~ msgstr "在席状況 (_S)"
 
-#~ msgid ""
-#~ "<b>Connecting to server</b>\n"
-#~ "\n"
-#~ "Please wait..."
-#~ msgstr ""
-#~ "<b>サーバに接続しています</b>\n"
-#~ "\n"
-#~ "しばらくお待ちください..."
-
-#~ msgid "<b>Please choose one of the options below:</b>"
-#~ msgstr "<b>下の選択肢から一つ選んでください:</b>"
-
-#~ msgid "<b>Please fill in the data for your existing account</b>"
-#~ msgstr "<b>既にお持ちのアカウントの情報を入力してください</b>"
-
-#~ msgid "<b>Please select a server</b>"
-#~ msgstr "<b>サーバーを選択してください</b>"
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ msgid ""
-#~ "Add this certificate to the list of trusted certificates.\n"
-#~ "SHA1 fingerprint of the certificate:\n"
-#~ msgstr ""
-#~ "この証明書を、信頼できる証明書一覧に加えます。\n"
-#~ "この証明書の SHA1 指紋:\n"
-
-#~ msgid "Anon_ymous authentication"
-#~ msgstr "匿名の認証 (_y)"
-
-#~ msgid "Connect when I press Finish"
-#~ msgstr "「完了」を押したらすぐに接続する"
-
-#~ msgid "Gajim: Account Creation Wizard"
-#~ msgstr "Gajim: アカウント作成ウィザード"
-
-#~ msgid "I already have an account I want to _use"
-#~ msgstr "既にアカウントを持っているのでそれを使う (_u)"
-
-#~ msgid "I want to _register for a new account"
-#~ msgstr "新しいアカウントを作成する (_r)"
-
-#~ msgid "If checked, Gajim will remember the password for this account"
-#~ msgstr "チェックをつけると、Gajim はこのアカウントのパスワードを記憶します"
-
-#~ msgid "Manage..."
-#~ msgstr "管理..."
-
-#~ msgid "Prox_y:"
-#~ msgstr "プロキシ (_y)"
-
-#~ msgid "Save pass_word"
-#~ msgstr "パスワードを保存する"
-
-#~ msgid "Set my profile when I connect"
-#~ msgstr "接続時に自分のプロフィールを設定する"
-
-#~ msgid "Use custom hostname/port"
-#~ msgstr "別のホスト名/ポート番号を使う"
-
-#~ msgid ""
-#~ "You need to have an account in order to connect\n"
-#~ "to the Jabber network."
-#~ msgstr "Jabber ネットワークに接続するには、アカウントが必要です。"
-
-#~ msgid "_Advanced"
-#~ msgstr "拡張 (_A)"
-
-#~ msgid "_Finish"
-#~ msgstr "完了 (_F)"
-
-#~ msgid "_Hostname:"
-#~ msgstr "ホスト名 (_H):"
-
-#~ msgid "_Jabber ID:"
-#~ msgstr "Jabber ID (_J):"
-
-#~ msgid "_Password:"
-#~ msgstr "パスワード (_P):"
-
-#~ msgid "_Port:"
-#~ msgstr "ポート番号 (_P):"
-
-#~ msgid "_Server:"
-#~ msgstr "サーバー (_S):"
-
-#~ msgid "<b>Miscellaneous</b>"
-#~ msgstr "<b>その他の設定</b>"
-
-#~ msgid "<b>OpenPGP</b>"
-#~ msgstr "<b>OpenPGP</b>"
-
-#~ msgid "<b>Personal Information</b>"
-#~ msgstr "<b>個人情報</b>"
-
-#~ msgid "Account"
-#~ msgstr "アカウント"
-
 #~ msgid "Account Modification"
 #~ msgstr "アカウントの変更"
 
-#~ msgid "Administration operations"
-#~ msgstr "管理の操作"
-
-#~ msgid "Auto-reconnect when connection is lost"
-#~ msgstr "切断したら自動で再接続する"
-
-#~ msgid "C_onnect on Gajim startup"
-#~ msgstr "Gajim 起動時に接続する (_o)"
-
-#~ msgid "Chan_ge Password"
-#~ msgstr "パスワードを変更する (_g)"
-
 # (Mako)broadcast 困った。しかたなくカタカナで
 #~ msgid ""
 #~ "Check this so Gajim will connect in port 5223 where legacy servers are "
@@ -7575,39 +10014,12 @@ msgstr " リソース。優先順位は "
 #~ "ください。またこのオプションを有効にすると TLS は無効とされることに注意し"
 #~ "てください。"
 
-#~ msgid "Choose _Key..."
-#~ msgstr "鍵の選択 (_K)..."
-
-#~ msgid "Click to change account's password"
-#~ msgstr "アカウントのパスワードを変更するにはクリック"
-
-#~ msgid "Click to request authorization to all contacts of another account"
-#~ msgstr "別アカウントのすべての相手先に承認を求めるにはクリック"
-
-#~ msgid "Connection"
-#~ msgstr "接続"
-
 #~ msgid "Edit Personal Information..."
 #~ msgstr "個人情報を編集する..."
 
 #~ msgid "Hostname: "
 #~ msgstr "ホスト名: "
 
-# (Mako)broadcast 困った。ここは「同報」で
-#~ msgid ""
-#~ "If checked, Gajim will also broadcast some more IPs except from just your "
-#~ "IP, so file transfer has higher chances of working."
-#~ msgstr ""
-#~ "チェックをつけると、Gajim はあなたの IP を除くいくつかの IP に同報します。"
-#~ "それによってファイル転送はうまくいく可能性が高くなります。"
-
-#~ msgid ""
-#~ "If checked, Gajim will send keep-alive packets to prevent connection "
-#~ "timeout which results in disconnection"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim はタイムアウトで接続が切れてしまうのを防ぐために"
-#~ "生存パケットを流すようになります"
-
 #~ msgid ""
 #~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 #~ "permission only for you"
@@ -7615,338 +10027,30 @@ msgstr " リソース。優先順位は "
 #~ "チェックをつけると、Gajim はパスワードを ~/.gajim/config に保存し、ユー"
 #~ "ザーのみに「読み出し」を許可します"
 
-#~ msgid ""
-#~ "If checked, Gajim, when launched, will automatically connect to jabber "
-#~ "using this account"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim は起動時に、このアカウントを使って jabber に自動"
-#~ "的に接続します"
-
-#~ 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 "Information about you, as stored in the server"
-#~ msgstr "サーバに格納する、あなたに関する情報です"
-
-#~ msgid "Personal Information"
-#~ msgstr "個人情報"
-
 #~ msgid "Port: "
 #~ msgstr "ポート番号: "
 
-#~ msgid "Priori_ty:"
-#~ msgstr "優先順位 (_t):"
-
-#~ msgid ""
-#~ "Priority is used in Jabber to determine who gets the events from the "
-#~ "jabber server when two or more clients are connected using the same "
-#~ "account; The client with the highest priority gets the events"
-#~ msgstr ""
-#~ "優先順位は、同じアカウントで二つ以上のクライアントから接続しているときに "
-#~ "jabber サーバーからのイベントの受け取り先を決定するのに使われます。最も高"
-#~ "い優先順位のクライアントがイベントを受け取ります"
-
-#~ msgid "Priority will change automatically according to your status."
-#~ msgstr "優先順位は、在席状況に応じて自動的に変わります。"
-
 #~ msgid "Proxy:"
 #~ msgstr "プロキシ:"
 
-#~ msgid "Resour_ce:"
-#~ msgstr "リソース (_c):"
-
-#~ 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' として同時に接続しているかもしれません。最"
-#~ "も優先順位の高いリソースがイベントを受け取ります(下記参照)。"
-
 #~ msgid "Save _passphrase (insecure)"
 #~ msgstr "パスフレーズの保存 (安全ではない) (_p)"
 
-#~ msgid "Save conversation _logs for all contacts"
-#~ msgstr "すべての相手先の会話記録を保存する (_l)"
-
 #~ msgid "Send keep-alive packets"
 #~ msgstr "生存パケットを送信する"
 
-#~ msgid "Synch_ronize account status with global status"
-#~ msgstr "アカウントの在席状況を全体の在席状況に合わせる (_r)"
-
-#~ msgid "Synchronise contacts"
-#~ msgstr "相手先の同期"
-
 #~ msgid "Use _SSL (legacy)"
 #~ msgstr "SSL を使う (旧式) (_S) "
 
-#~ msgid "Use file transfer proxies"
-#~ msgstr "ファイル転送のプロキシを使う"
-
 #~ msgid "_Adjust to status"
 #~ msgstr "在席状況に合わせる (_A)"
 
-#~ msgid "_Name:"
-#~ msgstr "名前 (_N):"
-
-#~ msgid "<b>Proxy</b>"
-#~ msgstr "<b>プロキシ</b>"
-
-#~ msgid "A_djust to status"
-#~ msgstr "在席状況に合わせる (_d)"
-
-#~ msgid "Accounts"
-#~ msgstr "アカウント"
-
-#~ msgid "Anonymous authentication"
-#~ msgstr "匿名の認証"
-
-#~ msgid ""
-#~ "Check this so Gajim will ask you before sending your password over an "
-#~ "insecure connection."
-#~ msgstr ""
-#~ "チェックをつけると、安全でない接続の前にパスワードを聞いてくるようになりま"
-#~ "す。"
-
-#~ msgid "Co_nnect on Gajim startup"
-#~ msgstr "Gajim 起動時に接続する (_n)"
-
-#~ msgid "E-Mail:"
-#~ msgstr "E-メール:"
-
-#~ msgid "First Name:"
-#~ msgstr "名:"
-
-#~ msgid ""
-#~ "If checked, Gajim will get the password from a GPG agent like seahorse"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim は seahorse など GPG エージェントからパスワード"
-#~ "を受け取ります"
-
-#~ 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 "Last Name:"
-#~ msgstr "姓:"
-
-#~ msgid "Mer_ge accounts"
-#~ msgstr "アカウントの統合 (_g)"
-
-#~ msgid "Send _keep-alive packets"
-#~ msgstr "生存パケットを送信する (_k)"
-
-#~ msgid "Synchroni_ze account status with global status"
-#~ msgstr "アカウントの在席状況を全体の在席状況に合わせる (_z)"
-
-#~ msgid "Use G_PG Agent"
-#~ msgstr "GPG エージェントを使う (_P)"
-
-#~ msgid "Use cust_om hostname/port"
-#~ msgstr "別のホスト名/ポート番号を使う (_o)"
-
-#~ msgid "Use cust_om port:"
-#~ msgstr "別のポート番号を使う (_o):"
-
-#~ msgid "_Edit Personal Information..."
-#~ msgstr "個人情報を編集する (_E)..."
-
-#~ msgid "_Enable"
-#~ msgstr "有効 (_E)"
-
-#~ msgid "_Hostname: "
-#~ msgstr "ホスト名 (_H):"
-
-#~ msgid "_Manage..."
-#~ msgstr "管理 (_M)..."
-
-#~ msgid "_Port: "
-#~ msgstr "ポート番号 (_P):"
-
-#~ msgid "_Warn before using an insecure connection"
-#~ msgstr "安全でない接続の前には警告する (_W)"
-
-#~ msgid "_use HTTP__PROXY environment variable"
-#~ msgstr "環境変数 HTTP__PROXY を使う (_u)"
-
-#~ msgid "A_ccount:"
-#~ msgstr "アカウント (_c):"
-
-#~ msgid "A_llow this contact to view my status"
-#~ msgstr "この相手先に自分の在席状況を見ることを許可する (_l)"
-
-#~ msgid "Add New Contact"
-#~ msgstr "新しい相手先を追加する"
-
-#~ 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 ""
-#~ "このプロトコルの相手先を追加するためには、\n"
-#~ "この中継先に登録しなければなりません。\n"
-#~ "登録ボタンを押して次に進んでください。"
-
-#~ msgid ""
-#~ "You must be connected to the transport to be able\n"
-#~ "to add a contact from this protocol."
-#~ msgstr ""
-#~ "このプロトコルの相手先を追加するためには、\n"
-#~ "この中継先に接続していなければなりません。"
-
-#~ msgid "_Group:"
-#~ msgstr "グループ (_G):"
-
-#~ msgid "_Nickname:"
-#~ msgstr "ニックネーム (_N):"
-
-#~ msgid "_Protocol:"
-#~ msgstr "プロトコル (_P):"
-
-#~ msgid "_Register"
-#~ msgstr "登録 (_R)"
-
-#~ msgid "_User ID:"
-#~ msgstr "ユーザー ID (_U):"
-
-#~ msgid "<b>An error has occurred:</b>"
-#~ msgstr "<b>エラーが発生しました:</b>"
-
-#~ msgid "<b>Choose command to execute:</b>"
-#~ msgstr "<b>実行するコマンドを選択してください:</b>"
-
-#~ msgid "Ad-hoc Commands - Gajim"
-#~ msgstr "Ad-hoc コマンド - Gajim"
-
-#~ msgid "Check once more"
-#~ msgstr "やり直す"
-
-#~ msgid "Error description..."
-#~ msgstr "エラーの説明..."
-
-#~ msgid "Please wait while retrieving command list..."
-#~ msgstr "コマンド一覧を取得しています。しばらくお待ちください..."
-
-#~ msgid "Please wait while the command is sending..."
-#~ msgstr "コマンドを送信しています。しばらくお待ちください..."
-
-#~ msgid "Please wait..."
-#~ msgstr "しばらくお待ちください..."
-
-# (Mako)entity はしかたなくカタカナで
-#~ msgid "This jabber entity does not expose any commands."
-#~ msgstr "このエンティティはコマンドを受け付けません。"
-
-#~ msgid "<b>Description</b>"
-#~ msgstr "<b>説明</b>"
-
-#~ msgid ""
-#~ "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
-#~ msgstr "<b>注意:</b> 設定を有効にするには Gajim を再起動してください"
-
-#~ msgid "Advanced Configuration Editor"
-#~ msgstr "詳細設定エディタ"
-
-#~ msgid "Filter:"
-#~ msgstr "フィルタ:"
-
 #~ msgid "Delete MOTD"
 #~ msgstr "MOTD を削除"
 
-#~ msgid "Deletes Message of the Day"
-#~ msgstr "今日のメッセージを削除します"
-
-#~ msgid "Edit _Privacy Lists..."
-#~ msgstr "プライバシーリストを編集..."
-
-#~ msgid "Sends a message to users currently connected to this server"
-#~ msgstr "現在このサーバーに接続しているユーザーにメッセージを送信する"
-
-#~ msgid "Set MOTD..."
-#~ msgstr "MOTD を設定..."
-
-#~ msgid "Sets Message of the Day"
-#~ msgstr "今日のメッセージを設定します"
-
-#~ msgid "Show _XML Console"
-#~ msgstr "XML コンソールを表示 (_X)"
-
-#~ msgid "Update MOTD..."
-#~ msgstr "MOTD を更新..."
-
-#~ msgid "Updates Message of the Day"
-#~ msgstr "今日のメッセージを更新します"
-
-#~ msgid "_Administrator"
-#~ msgstr "管理人 (_A)"
-
 #~ msgid "_Send Server Message..."
 #~ msgstr "サーバーメッセージを送信 (_S)..."
 
-#~ msgid " a window/tab opened with that contact "
-#~ msgstr "ウィンドウ/タブで開く "
-
-#~ msgid "<b>Actions</b>"
-#~ msgstr "<b>操作</b>"
-
-#, fuzzy
-#~ msgid "<b>Conditions</b>"
-#~ msgstr "<b>状況</b>"
-
-#~ msgid "<b>Sounds</b>"
-#~ msgstr "<b>耳への通知</b>"
-
-#~ msgid "Advanced Actions"
-#~ msgstr "詳細な操作"
-
-#~ msgid "Advanced Notifications Control"
-#~ msgstr "通知の制御の詳細"
-
-#, fuzzy
-#~ msgid "All statuses"
-#~ msgstr "すべての状況"
-
-#~ msgid "Busy "
-#~ msgstr "取り込み中です"
-
-#, fuzzy
-#~ msgid "Don't have "
-#~ msgstr "持っていません "
-
-#, fuzzy
-#~ msgid "Have "
-#~ msgstr "持っています "
-
-#, fuzzy
-#~ msgid "Launch a command"
-#~ msgstr "コマンドを実行する"
-
-#, fuzzy
-#~ msgid "One or more special statuses..."
-#~ msgstr "特別な状況..."
-
-#~ msgid "Online / Free For Chat"
-#~ msgstr "オンライン / チャットできます"
-
-#~ msgid "Play a sound"
-#~ msgstr "サウンドを演奏する"
-
 #~ msgid ""
 #~ "Receive a Message\n"
 #~ "Contact Disconnected \n"
@@ -7966,47 +10070,6 @@ msgstr " リソース。優先順位は "
 #~ "ファイル転送の開始した\n"
 #~ "ファイル転送の完了した"
 
-#~ msgid "When "
-#~ msgstr "次の場合: "
-
-#, fuzzy
-#~ msgid ""
-#~ "_Activate window manager's UrgencyHint to make chat window in taskbar "
-#~ "flash"
-#~ msgstr ""
-#~ "タスクバーのフラッシュでチャットウィンドウを作るために、ウィンドウマネー"
-#~ "ジャの UrgencyHint を有効にする (_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 roster"
-#~ msgstr "名簿へのイベントの表示をやめる (_D)"
-
-#~ msgid "_Disable showing event in systray"
-#~ msgstr "システムトレイへのイベントの表示をやめる (_D)"
-
-#~ msgid "_Inform me with a popup window"
-#~ msgstr "ポップアップウィンドウで知らせる (_I)"
-
-#~ msgid "_Open chat window with user"
-#~ msgstr "ユーザーのチャットウィンドウを開く (_O)"
-
-#~ msgid "_Show event in roster"
-#~ msgstr "イベントを名簿に表示する (_S)"
-
-#~ msgid "_Show event in systray"
-#~ msgstr "イベントをシステムトレイに表示する (_S)"
-
-#~ msgid "and I "
-#~ msgstr "と私 "
-
 #~ msgid ""
 #~ "contact(s)\n"
 #~ "group(s)\n"
@@ -8016,60 +10079,9 @@ msgstr " リソース。優先順位は "
 #~ "グループ\n"
 #~ "すべて"
 
-#~ msgid "Entry:"
-#~ msgstr "エントリー:"
-
-#~ msgid "Feed name:"
-#~ msgstr "フィード名:"
-
-#~ msgid "Last modified:"
-#~ msgstr "最終更新:"
-
-#~ msgid "New entry received"
-#~ msgstr "新しいエントリーを受け取りました"
-
-#~ msgid "Blocked Contacts"
-#~ msgstr "拒否されている相手先"
-
-#~ msgid "<b>Message:</b> "
-#~ msgstr "<b>メッセージ:</b> "
-
-#~ msgid "Set Activity"
-#~ msgstr "動向の設定"
-
-#~ msgid "Set an activity"
-#~ msgstr "動向の設定"
-
-#~ msgid "<b>Message:</b>"
-#~ msgstr "<b>メッセージ:</b>"
-
-#~ msgid "<b>Mood:</b>"
-#~ msgstr "<b>気分:</b>"
-
-#~ msgid "Change Password"
-#~ msgstr "パスワードの変更"
-
-#~ msgid "Enter it again for confirmation:"
-#~ msgstr "確認のためもう一度入力してください:"
-
-#~ msgid "Enter new password:"
-#~ msgstr "新しいパスワードを入力してください:"
-
-#~ msgid "<b>Type your new status message</b>"
-#~ msgstr "<b>新しい状況メッセージを入力してください</b>"
-
-#~ msgid "Preset messages:"
-#~ msgstr "用意されたメッセージ:"
-
-#~ msgid "Save as Preset..."
-#~ msgstr "用意しておくメッセージとして保存..."
-
 #~ msgid "Join _Group Chat"
 #~ msgstr "グループチャットに参加する (_G)"
 
-#~ msgid "_Add to Roster..."
-#~ msgstr "名簿に追加する (_A)..."
-
 #~ msgid "_Copy JID/Email Address"
 #~ msgstr "JID/Eメールアドレスのコピー (_C)"
 
@@ -8085,147 +10097,6 @@ msgstr " リソース。優先順位は "
 #~ msgid "_Start Chat"
 #~ msgstr "チャットの開始 (_S)"
 
-#~ msgid "In_vite"
-#~ msgstr "招待 (_v)"
-
-#~ msgid "Invite Friends!"
-#~ msgstr "友だちを招待 !"
-
-#~ msgid "MUC server"
-#~ msgstr "グループチャットのサーバー"
-
-#~ msgid "Please select a MUC server."
-#~ msgstr "グループチャットのサーバーを選択してください。"
-
-#~ msgid ""
-#~ "You are going to begin a Multi-User Chat.\n"
-#~ "Select the contacts you want to invite"
-#~ msgstr ""
-#~ "グループチャットを始めようとしています。\n"
-#~ "招待したい相手先を選択してください"
-
-#~ msgid "A_sk to see his/her status"
-#~ msgstr "相手の在席状況を見ることを申し込む (_s)"
-
-#~ msgid "Add Special _Notification..."
-#~ msgstr "特別な状態通知を追加する (_N)..."
-
-#~ msgid "Assign Open_PGP Key..."
-#~ msgstr "Open_PGP 鍵の割り当て..."
-
-#~ msgid "E_xecute Command..."
-#~ msgstr "コマンドの実行 (_x)..."
-
-#~ msgid "Edit _Groups..."
-#~ msgstr "グループの変更 (_G)..."
-
-#~ msgid "Invite _Contacts"
-#~ msgstr "相手先を招待 (_C)"
-
-#~ msgid "Send Single _Message..."
-#~ msgstr "単発メッセージの送信 (_M)..."
-
-#~ msgid "Send _File..."
-#~ msgstr "ファイルの送信 (_S)..."
-
-#~ msgid "Set Custom _Avatar..."
-#~ msgstr "独自アバターの設定 (_A)..."
-
-#~ msgid "Start _Chat"
-#~ msgstr "チャットの開始 (_C)"
-
-#~ msgid "Toggle End to End Encryption"
-#~ msgstr "全線暗号化(E2EE) (トグル)"
-
-#~ msgid "Toggle Open_PGP Encryption"
-#~ msgstr "Open_PGP 暗号化 (トグル)"
-
-#~ msgid "_Allow him/her to see my status"
-#~ msgstr "自分の在席状況を見られることを許可する (_A)"
-
-#~ msgid "_Forbid him/her to see my status"
-#~ msgstr "自分の在席状況を見られることを禁止する (_F)"
-
-#~ msgid "_Ignore"
-#~ msgstr "無視 (_I)"
-
-#~ msgid "_Manage Contact"
-#~ msgstr "相手先の管理 (_M)"
-
-#~ msgid "_Rename..."
-#~ msgstr "名前の変更 (_R)..."
-
-#~ msgid "_Subscription"
-#~ msgstr "在席通知の申し込み (_S)"
-
-#~ msgid "_Unignore"
-#~ msgstr "無視しない (_U)"
-
-#~ msgid "Fill in the form."
-#~ msgstr "次の欄を埋めてください。"
-
-#~ msgid "Edit Groups"
-#~ msgstr "グループの編集"
-
-#~ msgid "_Verify"
-#~ msgstr "検査 (_V)"
-
-#~ msgid "<b>List of possible features in Gajim:</b>"
-#~ msgstr "<b>Gajim の現在有効な機能の一覧:</b>"
-
-#~ msgid "Features"
-#~ msgstr "機能"
-
-#~ msgid "A list of active, completed and stopped file transfers"
-#~ msgstr "ファイル転送の転送中、完了、中止の一覧"
-
-#~ msgid "Cancels the selected file transfer"
-#~ msgstr "選択されたファイルの転送を中止します"
-
-#~ msgid "Cancels the selected file transfer and removes incomplete file"
-#~ msgstr "選択されたファイルの転送を中止し、不完全なファイルは削除します"
-
-#~ msgid "Clean _up"
-#~ msgstr "消去 (_u)"
-
-#~ msgid "File Transfers"
-#~ msgstr "ファイルの転送"
-
-# (Mako)この場合は「閉じる」
-#~ msgid "Hides the window"
-#~ msgstr "ウィンドウを閉じる"
-
-#~ msgid "Remove file transfer from the list."
-#~ msgstr "ファイル転送を一覧から削除します。"
-
-#~ msgid "Removes completed, cancelled and failed file transfers from the list"
-#~ msgstr "一覧から完了、中止、失敗したファイル転送を削除します"
-
-#~ msgid "Shows a list of file transfers between you and others"
-#~ msgstr "ファイル転送の一覧を表示します"
-
-#~ msgid ""
-#~ "This action removes single file transfer from the list. If the transfer "
-#~ "is active, it is first stopped and then removed"
-#~ msgstr ""
-#~ "一覧からひとつのファイル転送を削除します。転送中の場合、まず転送を中止し、"
-#~ "それから削除してください"
-
-#~ msgid "When a file transfer is complete show a popup notification"
-#~ msgstr "ファイル転送が完了したら、ポップアップで知らせる"
-
-#~ msgid "_Notify me when a file transfer is complete"
-#~ msgstr "ファイル転送が完了したら知らせる (_N)"
-
-#~ msgid "_Pause"
-#~ msgstr "一時停止 (_P)"
-
-#~ msgid "file transfers list"
-#~ msgstr "ファイル転送の一覧"
-
-#~ msgid "<b>Chatstate Tab Colors</b>"
-#~ msgstr "<b>チャット状態のタブの色</b>"
-
 #~ msgid ""
 #~ "Account row\n"
 #~ "Group row\n"
@@ -8237,44 +10108,6 @@ msgstr " リソース。優先順位は "
 #~ "相手先\n"
 #~ "チャットバナー"
 
-#~ msgid "Composing"
-#~ msgstr "入力中"
-
-#~ msgid "Font style:"
-#~ msgstr "フォントのスタイル:"
-
-#~ msgid "Gajim Themes Customization"
-#~ msgstr "Gajim テーマのカスタマイズ"
-
-#~ msgid "Gone"
-#~ msgstr "不在"
-
-#~ msgid ""
-#~ "MUC\n"
-#~ "Messages"
-#~ msgstr ""
-#~ "グループチャット\n"
-#~ "メッセージ"
-
-#~ msgid ""
-#~ "MUC Directed\n"
-#~ "Messages"
-#~ msgstr ""
-#~ "グループチャットでの\n"
-#~ "指示メッセージ"
-
-#~ msgid "Paused"
-#~ msgstr "一時停止中"
-
-#~ msgid "Text _color:"
-#~ msgstr "文字の色 (_c):"
-
-#~ msgid "Text _font:"
-#~ msgstr "フォント (_f):"
-
-#~ msgid "_Background:"
-#~ msgstr "背景色 (_B):"
-
 #~ msgid "Change _Nickname..."
 #~ msgstr "ニックネームの変更 (_N)..."
 
@@ -8290,81 +10123,15 @@ msgstr " リソース。優先順位は "
 #~ msgid "_Manage Room"
 #~ msgstr "談話室の管理 (_M)"
 
-#~ msgid "_Minimize on close"
-#~ msgstr "閉じるボタンで最小化 (_M)"
-
-#~ msgid "Mo_derator"
-#~ msgstr "司会者 (_d)"
-
-#~ msgid "Occupant Actions"
-#~ msgstr "在室者の操作"
-
 #~ msgid "Send _File"
 #~ msgstr "ファイルの送信 (_F)"
 
 #~ msgid "_Add to Roster"
 #~ msgstr "名簿に追加 (A)"
 
-#~ msgid "_Admin"
-#~ msgstr "管理人 (_A)"
-
-#~ msgid "_Ban"
-#~ msgstr "締め出し (_B)"
-
-#~ msgid "_Kick"
-#~ msgstr "蹴り出し (_K)"
-
-#~ msgid "_Member"
-#~ msgstr "メンバー (_M)"
-
-#~ msgid "_Owner"
-#~ msgstr "主宰者 (_O)"
-
 #~ msgid "_Send Private Message"
 #~ msgstr "私信を送る (_S)"
 
-# (Mako)moderated room での発言する権利
-#~ msgid "_Voice"
-#~ msgstr "発言権 (_V)"
-
-#, fuzzy
-#~ msgid "Create new post"
-#~ msgstr "新しいポストの作成"
-
-#~ 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 "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-#~ msgstr "<big><b>Gajim 履歴記録マネージャ</b></big>"
-
-#~ msgid "Export"
-#~ msgstr "書き出し"
-
-#~ msgid "Gajim History Logs Manager"
-#~ msgstr "Gajim 履歴記録マネージャ"
-
-#~ 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 ""
-#~ "この記録マネージャは記録を見るためのものではありません。そのような機能をお"
-#~ "求めなら、かわりに履歴ウィンドウをお使いください。\n"
-#~ "\n"
-#~ "このプログラムは記録の削除や書き出しのためにお使いください。左の一覧から記"
-#~ "録を選択し、また下の欄でデータベースを検索することができます。"
-
-#~ msgid "_Search Database"
-#~ msgstr "データベースの検索 (_S)"
-
 #~ msgid ""
 #~ "Enter JID or Contact name\n"
 #~ "Groupchat Histories\n"
@@ -8374,65 +10141,9 @@ msgstr " リソース。優先順位は "
 #~ "グループチャットの履歴\n"
 #~ "すべてのチャットの履歴"
 
-#~ msgid "Search:"
-#~ msgstr "検索:"
-
-#~ msgid "_Log conversation history"
-#~ msgstr "会話の履歴を記録 (_L)"
-
-#~ msgid "Bookmark this room"
-#~ msgstr "この談話室をブックマーク"
-
-#~ msgid "Join this room automatically when I connect"
-#~ msgstr "接続時に自動的にこの談話室に参加する"
-
-#~ msgid "Nickname:"
-#~ msgstr "ニックネーム:"
-
-#~ msgid "Password:"
-#~ msgstr "パスワード:"
-
-#~ msgid "Recently:"
-#~ msgstr "最近使った:"
-
-#~ msgid "Room:"
-#~ msgstr "談話室:"
-
 #~ msgid "Manage Accounts"
 #~ msgstr "アカウントの管理"
 
-#~ msgid "Auto join"
-#~ msgstr "自動参加"
-
-#~ msgid "If checked, Gajim will join this group chat on startup"
-#~ msgstr "チェックをつけると、スタート時にこのグループチャットに参加します"
-
-#~ msgid "Manage Bookmarks"
-#~ msgstr "ブックマークの管理"
-
-#~ msgid "Minimize on Auto Join"
-#~ msgstr "自動参加して最小化"
-
-#~ msgid "Print status:"
-#~ msgstr "状況の表示:"
-
-#~ msgid "Title:"
-#~ msgstr "タイトル:"
-
-# (Mako)Personal Eventing via Pubsub
-#, fuzzy
-#~ msgid "PEP Service Configuration"
-#~ msgstr "PEP サービスの調整"
-
-#~ msgid "_Configure"
-#~ msgstr "調整 (_C)"
-
-#~ msgid "<b>Properties</b>"
-#~ msgstr "<b>プロパティ</b>"
-
-#~ msgid "<b>Settings</b>"
-#~ msgstr "<b>設定</b>"
-
 #~ msgid ""
 #~ "HTTP Connect\n"
 #~ "SOCKS5\n"
@@ -8442,33 +10153,6 @@ msgstr " リソース。優先順位は "
 #~ "SOCKS5\n"
 #~ "BOSH"
 
-#~ msgid "Manage Proxy Profiles"
-#~ msgstr "プロクシの設定"
-
-#~ msgid "Pass_word:"
-#~ msgstr "パスワード (_w):"
-
-#~ msgid "Proxy _Host:"
-#~ msgstr "プロキシのホスト (_H):"
-
-#~ msgid "Proxy _Port:"
-#~ msgstr "プロキシのポート (_P):"
-
-#~ msgid "Use HTTP prox_y"
-#~ msgstr "HTTP プロキシを利用する (_y)"
-
-#~ msgid "Use proxy auth_entication"
-#~ msgstr "プロクシの認証を使用する (_e)"
-
-#~ msgid "_BOSH URL:"
-#~ msgstr "BOSH URL (_B):"
-
-#~ msgid "_Type:"
-#~ msgstr "種類 (_T):"
-
-#~ msgid "_Username:"
-#~ msgstr "ユーザー名 (_U):"
-
 #~ msgid "Add this contact to roster (Ctrl+D)"
 #~ msgstr "この相手先を名簿に追加する (Ctrl+D)"
 
@@ -8502,61 +10186,6 @@ msgstr " リソース。優先順位は "
 #~ msgid "Show the contact's profile (Ctrl+I)"
 #~ msgstr "相手先のプロフィールの表示 (Ctrl+I)"
 
-#~ msgid "Passphrase"
-#~ msgstr "パスフレーズ"
-
-#~ msgid "<b>Advanced Configuration Editor</b>"
-#~ msgstr "<b>詳細設定エディタ</b>"
-
-#~ msgid "<b>Applications</b>"
-#~ msgstr "<b>アプリケーション</b>"
-
-#~ msgid "<b>Auto Status</b>"
-#~ msgstr "<b>在席状況の自動変更</b>"
-
-#~ msgid "<b>Chat Appearance</b>"
-#~ msgstr "<b>チャットの外観</b>"
-
-#~ msgid "<b>Chat Line Colors</b>"
-#~ msgstr "<b>チャット行の色</b> "
-
-#~ msgid "<b>Chat state notifications</b>"
-#~ msgstr "チャット状態の通知"
-
-#, fuzzy
-#~ msgid "<b>Custom</b>"
-#~ msgstr "<b>カスタム</b>"
-
-#~ msgid "<b>Font</b>"
-#~ msgstr "<b>フォント</b>"
-
-#~ msgid "<b>GMail Options</b>"
-#~ msgstr "<b>GMail オプション</b>"
-
-#~ msgid "<b>Preset Status Messages</b>"
-#~ msgstr "<b>用意された状況メッセージ</b>"
-
-#~ msgid "<b>Privacy</b>"
-#~ msgstr "<b>プライバシー</b>"
-
-#~ msgid "<b>Roster Appearance</b>"
-#~ msgstr "<b>名簿の外観</b>"
-
-#~ msgid "<b>Status Messages</b>"
-#~ msgstr "<b>在席状況のメッセージ</b>"
-
-#~ msgid "<b>Themes</b>"
-#~ msgstr "<b>テーマ</b>"
-
-#~ msgid "<b>Visual Notifications</b>"
-#~ msgstr "<b>目への通知</b>"
-
-#~ msgid "Advanced"
-#~ msgstr "拡張"
-
-#~ msgid "Advanced..."
-#~ msgstr "拡張..."
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -8566,19 +10195,6 @@ msgstr " リソース。優先順位は "
 #~ "入力中のみ\n"
 #~ "通知しない"
 
-#~ msgid "Allow _OS information to be sent"
-#~ msgstr "OS 情報の送信を許可する (_O)"
-
-#~ msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-#~ msgstr "離席/不在/取り込み中/隠れ中のポップアップ/通知を許可する (_a)"
-
-#~ msgid "Allow sound when I'm _busy"
-#~ msgstr "取り込み中でもサウンドを鳴らす (_b)"
-
-# (Mako)語順が難しい
-#~ msgid "Ask status message when I:"
-#~ msgstr "状況メッセージを求めるのは、私が "
-
 #~ msgid ""
 #~ "Autodetect on every Gajim startup\n"
 #~ "Always use GNOME default applications\n"
@@ -8592,15 +10208,6 @@ msgstr " リソース。優先順位は "
 #~ "常に Xfce のデフォルトのアプリケーション\n"
 #~ "ここで設定"
 
-#~ msgid "Chat message:"
-#~ msgstr "チャットメッセージ:"
-
-#~ msgid "Check on startup if Gajim is the _default Jabber client"
-#~ msgstr "起動時に、Gajim がデフォルトの Jabber クライアントかを調べる (_d)"
-
-#~ msgid "Configure color and font of the interface"
-#~ msgstr "色とフォントの調整"
-
 #~ msgid ""
 #~ "Detached roster with detached chats\n"
 #~ "Detached roster with single chat\n"
@@ -8614,198 +10221,6 @@ msgstr " リソース。優先順位は "
 #~ "名簿は別ウィンドウ、チャットはアカウントでまとめたウィンドウ\n"
 #~ "名簿は別ウィンドウ、チャットは種類でまとめたウィンドウ"
 
-#~ msgid "Display _activity of contacts in roster"
-#~ msgstr "名簿に相手先の動向を表示する (_a)"
-
-#~ msgid "Display _extra email details"
-#~ msgstr "メールの詳細を表示する (_e)"
-
-#~ msgid "Display _tunes of contacts in roster"
-#~ msgstr "名簿に相手先の聴いている楽曲を表示する (_t)"
-
-#~ msgid "Display a_vatars of contacts in roster"
-#~ msgstr "名簿に相手先のアバターを表示する"
-
-#~ msgid "Display m_ood of contacts in roster"
-#~ msgstr "名簿に相手先の気分を表示する (_o)"
-
-#~ msgid "Display status _messages of contacts in roster"
-#~ msgstr "名簿に相手先の状況メッセージを表示する"
-
-#~ 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 ""
-#~ "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 ""
-#~ "Gajim will notify you via a popup window in the bottom right of the "
-#~ "screen about contacts that just signed out"
-#~ msgstr ""
-#~ "画面の右下のポップアップウィンドウで、相手先がサインアウトしたときに通知し"
-#~ "ます"
-
-#~ msgid "Hide all buttons in chat windows"
-#~ msgstr "チャットウィンドウのすべてのボタンを隠します"
-
-#~ msgid ""
-#~ "If checked, Gajim will allow others to detect the operation system you "
-#~ "are using"
-#~ msgstr "チェックをつけると、Gajim は使用中の OS を知られることを許可します"
-
-#~ msgid ""
-#~ "If checked, Gajim will also include information about the sender of the "
-#~ "new emails"
-#~ msgstr "チェックをつけると、Gajim は電子メールの送信者の情報を含めます"
-
-#~ msgid ""
-#~ "If checked, Gajim will change status to Away when the computer is unused."
-#~ msgstr ""
-#~ "チェックをつけると、Gajim はコンピュータが使われていないとき、在席状況を"
-#~ "「離席中」に変更します"
-
-#~ msgid ""
-#~ "If checked, Gajim will change status to Not Available when the computer "
-#~ "has not been used even longer"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim はコンピュータが長い間使われていないとき、在席状"
-#~ "況を「不在」に変更します"
-
-#~ msgid ""
-#~ "If checked, Gajim will display avatars of contacts in roster window and "
-#~ "in group chats"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim は名簿ウィンドウとグループチャットに相手先のアバ"
-#~ "ターを表示します"
-
-#~ msgid ""
-#~ "If checked, Gajim will display status messages of contacts under the "
-#~ "contact name in roster window and in group chats"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim は名簿ウィンドウとグループチャットの相手先名の下"
-#~ "に状況メッセージを表示します"
-
-#~ msgid ""
-#~ "If checked, Gajim will display the activity of contacts in the roster "
-#~ "window"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim は名簿ウィンドウに相手先の動向を表示します"
-
-#~ msgid ""
-#~ "If checked, Gajim will display the mood 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 ""
-#~ "If checked, Gajim will highlight spelling errors in input fields of chat "
-#~ "windows. If no language is explicitly set via right click on the input "
-#~ "field, the default language will be used for this contact or group chat."
-#~ msgstr ""
-#~ "チェックをつけると、Gajim はチャットウィンドウの入力欄でスペルの間違いを強"
-#~ "調して表示します。入力欄での右クリックで言語を明示的に指定できますが、そう"
-#~ "されていない場合は、この相手先やグループチャットにはデフォルトの言語が適用"
-#~ "されます。"
-
-#~ msgid ""
-#~ "If checked, Gajim will ignore incoming events from unauthorized contacts. "
-#~ "Use with caution, because it blocks all messages from any contact that is "
-#~ "not in the roster"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim は承認していない相手先からのイベントを無視しま"
-#~ "す。名簿にない相手先からのすべてのメッセージを拒否しますので、注意してくだ"
-#~ "さい。"
-
-#~ msgid ""
-#~ "If 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) の場合は相手先が記録に同意していなければなりません。そうでな"
-#~ "ければ記録しないでください。"
-
-#~ msgid ""
-#~ "If checked, Gajim will show a notification when a new e-mail is received "
-#~ "via GMail"
-#~ msgstr ""
-#~ "チェックをつけると、Gajim は GMail 経由で新しいメールを受け取ったとき、通"
-#~ "知します"
-
-#~ 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 のアイコンがあります)"
-
-#~ msgid ""
-#~ "If enabled, Gajim will not ask for a status message. The specified "
-#~ "default message will be used instead."
-#~ msgstr ""
-#~ "チェックをつけると、Gajim は状況メッセージを要求しません。かわりに対応する"
-#~ "デフォルトのメッセージが使われます。"
-
-#~ msgid ""
-#~ "If not disabled, Gajim will replace ascii smilies like ':)' with "
-#~ "equivalent animated or static graphical emoticons"
-#~ msgstr ""
-#~ "「無効」でなければ、Gajim は ':)' のようなスマイリーを対応する画像に置き換"
-#~ "えます"
-
-#~ msgid "Log _encrypted chat session"
-#~ msgstr "暗号化チャットを記録する (_e)"
-
-#~ msgid "Ma_ke message windows compact"
-#~ msgstr "メッセージウィンドウを簡潔にする (_k)"
-
-#~ msgid "Ma_nage..."
-#~ msgstr "設定 (_n)..."
-
-#~ msgid ""
-#~ "Never\n"
-#~ "Only when pending events\n"
-#~ "Always"
-#~ msgstr ""
-#~ "表示しない\n"
-#~ "保留イベントがあるときだけ\n"
-#~ "常に"
-
-#~ msgid "Notifications"
-#~ msgstr "通知"
-
-#~ msgid "Notify me about contacts that sign _in"
-#~ msgstr "相手先のログインを通知する (_i)"
-
-#~ msgid "Notify me about contacts that sign _out"
-#~ msgstr "相手先のログアウトを通知する (_o)"
-
-#~ msgid "Notify on new _GMail email"
-#~ msgstr "新しい GMail メールを通知する (_G)"
-
-#~ msgid "Personal Events"
-#~ msgstr "個人イベント"
-
-#~ msgid "Play _sounds"
-#~ msgstr "サウンドを鳴らす (_s)"
-
 #~ msgid ""
 #~ "Pop it up\n"
 #~ "Notify me about it\n"
@@ -8815,173 +10230,12 @@ msgstr " リソース。優先順位は "
 #~ "それについて通知する\n"
 #~ "名簿に表示するだけ"
 
-#~ msgid "Preferences"
-#~ msgstr "設定"
-
-#~ msgid "Show systray:"
-#~ msgstr "システムトレイに表示:"
-
-# (Mako)"Ask status message when I:" に続く語
-#~ msgid "Sign _in"
-#~ msgstr "サインインしたとき (_i)"
-
-# (Mako)"Ask status message when I:" に続く語
-#~ msgid "Sign _out"
-#~ msgstr "サインアウトしたとき (_o)"
-
-#~ msgid ""
-#~ "Some messages may include rich content (formatting, colors etc). If "
-#~ "checked, Gajim will just display the raw message text."
-#~ msgstr ""
-#~ "メッセージが装飾(書式や色など)を含んでいる場合があります。チェックをつける"
-#~ "と、Gajim はそのままのメッセージ文を表示します。"
-
-#~ msgid "Sort contacts by status"
-#~ msgstr "相手先を在席状況順に並べる"
-
-#~ msgid "Status _iconset:"
-#~ msgstr "状況アイコン (_i):"
-
-#~ msgid "Style"
-#~ msgstr "スタイル"
-
-#~ msgid "T_heme:"
-#~ msgstr "テーマ (_h):"
-
-#~ 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 ""
-#~ "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 "Use _transports icons"
-#~ msgstr "中継先のアイコンを使う (_t)"
-
-#~ msgid "Use system _default"
-#~ msgstr "システムのデフォルトを使う (_d)"
-
-#~ msgid "When new event is received:"
-#~ msgstr "新しいイベントを受信したとき:"
-
-#~ msgid "_Away after:"
-#~ msgstr "「離席中」にする (_A):"
-
-#~ msgid "_Browser:"
-#~ msgstr "ブラウザ (_B):"
-
-#~ msgid "_Display chat state notifications:"
-#~ msgstr "チャット状態通知を表示する (_D):"
-
-#~ msgid "_Emoticons:"
-#~ msgstr "感情アイコン (_E):"
-
-#~ msgid "_File manager:"
-#~ msgstr "ファイルマネージャ (_F):"
-
-#~ msgid "_Highlight misspelled words"
-#~ msgstr "スペル間違いを強調表示する (_H)"
-
-#~ msgid "_Ignore events from contacts not in the roster"
-#~ msgstr "名簿にない相手先からのイベントを無視する (_I)"
-
-#~ msgid "_Ignore rich content in incoming messages"
-#~ msgstr "受信したメッセージの書式を無視する (_I)"
-
 #~ msgid "_Incoming message:"
 #~ msgstr "受信メッセージ (_I):"
 
-#~ msgid "_Log status changes of contacts"
-#~ msgstr "相手先の状況変更を記録する (_L)"
-
-#~ msgid "_Mail client:"
-#~ msgstr "メールクライアント (_M):"
-
-#~ msgid "_Not available after:"
-#~ msgstr "「不在」にする (_N):"
-
-#~ msgid "_Open..."
-#~ msgstr "開く (_O)..."
-
 #~ msgid "_Outgoing message:"
 #~ msgstr "送信メッセージ (_O):"
 
-#~ msgid "_Reset to Default Colors"
-#~ msgstr "デフォルトの色に戻す (_R)"
-
-#~ msgid "_Send chat state notifications:"
-#~ msgstr "チャット状態通知を送信する (_S):"
-
-#~ msgid "_Status message:"
-#~ msgstr "状況メッセージ (_S):"
-
-# (Mako)あえてカッコ書き
-#~ msgid "_URL highlight:"
-#~ msgstr "URL 強調表示 (_U):"
-
-#~ msgid "_Window behavior:"
-#~ msgstr "ウィンドウの配置 (_W):"
-
-#~ msgid "in _group chats"
-#~ msgstr "グループチャットで (_g)"
-
-#~ msgid "minutes"
-#~ msgstr "分後"
-
-#~ msgid "Privacy Lists:"
-#~ msgstr "個人リスト:"
-
-#~ msgid "<b>Add / Edit a rule</b>"
-#~ msgstr "<b>規則の追加/編集</b>"
-
-#~ msgid "<b>List of rules</b>"
-#~ msgstr "<b>規則の一覧</b>"
-
-#~ msgid "<i>Privacy List</i>"
-#~ msgstr "<i>プライバシーリスト</i>"
-
-#~ msgid "All"
-#~ msgstr "すべて"
-
-#~ msgid "All (including subscription)"
-#~ msgstr "すべて (在席通知を含む)"
-
-#~ msgid "Allow"
-#~ msgstr "許可する"
-
-#~ msgid "Deny"
-#~ msgstr "拒否する"
-
-#~ msgid "JabberID"
-#~ msgstr "JabberID"
-
-#, fuzzy
-#~ msgid "Order:"
-#~ msgstr "順位:"
-
-#, fuzzy
-#~ msgid "all by subscription"
-#~ msgstr "在席通知のすべて"
-
-#, fuzzy
-#~ msgid "all in the group"
-#~ msgstr "グループのすべて"
-
 #, fuzzy
 #~ msgid ""
 #~ "none\n"
@@ -8994,128 +10248,6 @@ msgstr " リソース。優先順位は "
 #~ "from\n"
 #~ "to"
 
-#, fuzzy
-#~ msgid "to send me messages"
-#~ msgstr "メッセージを私に送信する"
-
-#, fuzzy
-#~ msgid "to send me queries"
-#~ msgstr "クエリーを私に送信する"
-
-#, fuzzy
-#~ msgid "to send me status"
-#~ msgstr "状況を私に送信する"
-
-#, fuzzy
-#~ msgid "to view my status"
-#~ msgstr "私の状況を見せる"
-
-#~ msgid "<b>Address</b>"
-#~ msgstr "<b>住所</b>"
-
-#~ msgid "<b>Avatar:</b>"
-#~ msgstr "<b>アバター:</b>"
-
-#~ msgid "<b>Birthday:</b>"
-#~ msgstr "<b>誕生日:</b>"
-
-#~ msgid "<b>City:</b>"
-#~ msgstr "<b>市(町村):</b>"
-
-#~ msgid "<b>Company:</b>"
-#~ msgstr "<b>会社:</b>"
-
-#~ msgid "<b>Country:</b>"
-#~ msgstr "<b>国:</b>"
-
-#~ msgid "<b>Department:</b>"
-#~ msgstr "<b>部署:</b>"
-
-#~ msgid "<b>E-Mail:</b>"
-#~ msgstr "<b>メールアドレス:</b>"
-
-#~ msgid "<b>Extra Address:</b>"
-#~ msgstr "<b>建物名など:</b>"
-
-#~ msgid "<b>Family:</b>"
-#~ msgstr "<b>姓:</b>"
-
-#~ msgid "<b>Full Name</b>"
-#~ msgstr "<b>名前(フルネーム)</b>"
-
-#~ msgid "<b>Given:</b>"
-#~ msgstr "<b>名:</b>"
-
-#~ msgid "<b>Homepage:</b>"
-#~ msgstr "<b>ホームページ:</b>"
-
-#~ msgid "<b>Middle:</b>"
-#~ msgstr "<b>Middle:</b>"
-
-#~ msgid "<b>Name:</b>"
-#~ msgstr "<b>名前:</b>"
-
-#~ msgid "<b>Nickname:</b>"
-#~ msgstr "<b>ニックネーム:</b>"
-
-#~ msgid "<b>Phone No.:</b>"
-#~ msgstr "<b>電話番号:</b>"
-
-#~ msgid "<b>Position:</b>"
-#~ msgstr "<b>役職:</b>"
-
-#~ msgid "<b>Postal Code:</b>"
-#~ msgstr "<b>郵便番号:</b>"
-
-#~ msgid "<b>Prefix:</b>"
-#~ msgstr "<b>Prefix:</b>"
-
-#~ msgid "<b>State:</b>"
-#~ msgstr "<b>州(県):</b>"
-
-#~ msgid "<b>Street:</b>"
-#~ msgstr "<b>町丁名・番地:</b>"
-
-#~ msgid "<b>Suffix:</b>"
-#~ msgstr "<b>Suffix:</b>"
-
-#~ msgid "About"
-#~ msgstr "概略"
-
-#~ msgid "Click to set your avatar"
-#~ msgstr "アバターの設定"
-
-#~ msgid "Format: YYYY-MM-DD"
-#~ msgstr "書式: YYYY-MM-DD"
-
-#~ msgid "Personal Info"
-#~ msgstr "個人情報"
-
-#~ msgid "Work"
-#~ msgstr "職業"
-
-#~ msgid "<b>What do you want to do?</b>"
-#~ msgstr "<b>あなたがやりたいことは ?</b>"
-
-#~ msgid "Remove account from Gajim and from _server"
-#~ msgstr "アカウントを Gajim とサーバーからも削除 (_s)"
-
-#, fuzzy
-#~ 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>して"
-#~ "ほしいと思っています。"
-
-#, fuzzy
-#~ msgid "Roster Item Exchange"
-#~ msgstr "名簿の項目の交換"
-
-# (Mako)ほかの項目との並びで、バランスを考えてあえてカッコでつけ加えている
-#~ msgid "_OK"
-#~ msgstr "OK (_O)"
-
 #~ msgid "Add _Contact..."
 #~ msgstr "相手先リストに追加する (_C)..."
 
@@ -9125,39 +10257,18 @@ msgstr " リソース。優先順位は "
 #~ msgid "File _Transfers"
 #~ msgstr "ファイルの転送 (_T)"
 
-#~ msgid "Frequently Asked Questions (online)"
-#~ msgstr "よくある質問(オンライン)"
-
-#~ msgid "Help online"
-#~ msgstr "ヘルプ(オンライン)"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "プロフィールとアバター"
 
-#~ msgid "Show Only _Active Contacts"
-#~ msgstr "アクティブな相手先のみ表示 (_A)"
-
-#~ msgid "Show Trans_ports"
-#~ msgstr "中継先を表示 (_p)"
-
-#~ msgid "Show _Offline Contacts"
-#~ msgstr "オフラインの相手先を表示 (_O)"
-
 #~ msgid "_Accounts"
 #~ msgstr "アカウント (_A)"
 
-#~ msgid "_Actions"
-#~ msgstr "操作 (_A)"
-
 #~ msgid "_Contents"
 #~ msgstr "目次 (_C)"
 
 #~ msgid "_FAQ"
 #~ msgstr "_FAQ"
 
-#~ msgid "_Help"
-#~ msgstr "ヘルプ (_H)"
-
 #~ msgid "_Preferences"
 #~ msgstr "設定 (_P)"
 
@@ -9167,185 +10278,21 @@ msgstr " リソース。優先順位は "
 #~ msgid "_Send Single Message..."
 #~ msgstr "単発メッセージを送信する (_S)..."
 
-#~ msgid "_View"
-#~ msgstr "表示 (_V)"
-
-#~ msgid "Please wait while retrieving search form..."
-#~ msgstr "しばらくお待ちください…"
-
-#~ msgid "Search"
-#~ msgstr "検索"
-
-#~ msgid "G_o"
-#~ msgstr "実行 (_o)"
-
-#~ msgid "_Address:"
-#~ msgstr "アドレス (_A):"
-
-#, fuzzy
-#~ msgid "Register to"
-#~ msgstr "登録"
-
-#~ msgid "_Cancel"
-#~ msgstr "中止 (_C)"
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "From:"
-#~ msgstr "差出人:"
-
-#~ msgid "Reply to this message"
-#~ msgstr "このメッセージへの返信"
-
-#~ msgid "Sen_d"
-#~ msgstr "送信 (_d)"
-
-#~ msgid "Send message"
-#~ msgstr "メッセージを送信する"
-
-#~ msgid "Send message and close window"
-#~ msgstr "メッセージを送信してウィンドウを閉じる"
-
-#~ msgid "Subject:"
-#~ msgstr "件名:"
-
-#~ msgid "To:"
-#~ msgstr "宛先:"
-
-#~ msgid "_Reply"
-#~ msgstr "返信 (_R)"
-
-#~ msgid "_Send & Close"
-#~ msgstr "送信 & 閉じる (_S)"
-
-#~ msgid "Au_thorize"
-#~ msgstr "承認する (_t)"
-
-#~ msgid "Authorize contact so he or she can know when you're connected"
-#~ msgstr ""
-#~ "承認すると、あなたが接続したときに相手先はそのことを知ることができます"
-
-#~ msgid ""
-#~ "Deny authorization from contact so he or she cannot know when you're "
-#~ "connected"
-#~ msgstr ""
-#~ "承認しないと、あなたが接続したときに相手先はそのことを知ることができません"
-
-#~ msgid "Subscription Request"
-#~ msgstr "在席通知の申し込み"
-
-#~ msgid "_Deny"
-#~ msgstr "拒否する (_D)"
-
-#~ msgid "Select the account with which you want to synchronise"
-#~ msgstr "合わせたいアカウントを選択してください"
-
-#~ msgid "Select the contacts you want to synchronise"
-#~ msgstr "合わせたい相手先を選択してください"
-
-#, fuzzy
-#~ msgid "Synchronise : select contacts"
-#~ msgstr "同期: 相手先の選択"
-
-#~ msgid "Mute Sounds"
-#~ msgstr "サウンドのミュート"
-
 #~ msgid "Send Single _Message"
 #~ msgstr "単発メッセージの送信 (_M)"
 
-#~ msgid "Show All Pending _Events"
-#~ msgstr "すべての保留イベントの表示 (_E)"
-
 #~ msgid "Sta_tus"
 #~ msgstr "状態 (_t)"
 
 #~ msgid "_Group Chat"
 #~ msgstr "グループチャット (_G)"
 
-# (Mako)pending の意味か
-#~ msgid "<b>Ask:</b>"
-#~ msgstr "<b>保留中の申し込み:</b>"
-
-#~ msgid "<b>Client:</b>"
-#~ msgstr "<b>クライアント:</b>"
-
-#~ msgid "<b>Contact time:</b>"
-#~ msgstr "<b>通話時間:</b>"
-
-#~ msgid "<b>Jabber ID:</b>"
-#~ msgstr "<b>Jabber ID:</b>"
-
-#~ msgid "<b>Resource:</b>"
-#~ msgstr "<b>リソース:</b>"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>在席状況:</b>"
-
-#~ msgid "<b>Subscription:</b>"
-#~ msgstr "<b>在席通知:</b>"
-
-#~ msgid "<b>System:</b>"
-#~ msgstr "<b>システム:</b>"
-
-#~ msgid "Comments"
-#~ msgstr "備考"
-
-#, fuzzy
-#~ msgid "Configured avatar:"
-#~ msgstr "設定したアバター:"
-
-#~ msgid "Contact"
-#~ msgstr "相手先"
-
-#~ msgid "Contact Information"
-#~ msgstr "相手先の情報"
-
-#~ msgid "More"
-#~ msgstr "その他の情報"
-
-#~ msgid "User avatar:"
-#~ msgstr "ユーザーのアバター:"
-
-#, fuzzy
-#~ msgid "<b>Jabber Traffic</b>"
-#~ msgstr "<b>Jabber 通信</b>"
-
-#~ msgid "<b>XML Input</b>"
-#~ msgstr "<b>XML 入力</b>"
-
 #~ msgid "Enable"
 #~ msgstr "有効"
 
-#~ msgid "Info/Query"
-#~ msgstr "情報/クエリー (Info/Query)"
-
-#~ msgid "_IQ"
-#~ msgstr "_IQ"
-
-# (Mako)あえて訳さない
-#~ msgid "_Message"
-#~ msgstr "_Message"
-
-# (Mako)あえて訳さない
-#~ msgid "_Presence"
-#~ msgstr "_Presence"
-
 #~ msgid "_Modify Account..."
 #~ msgstr "アカウントの編集 (_M)"
 
-#~ msgid "Local jid:"
-#~ msgstr "ローカル jid:"
-
-#~ msgid "Personal"
-#~ msgstr "個人"
-
-#~ msgid "Resource:"
-#~ msgstr "リソース:"
-
-#~ msgid "Status:"
-#~ msgstr "在席状況:"
-
 #~ msgid "Invalid local address? :-O"
 #~ msgstr "ローカルアドレスが正しくありません。"
 
diff --git a/po/lt.po b/po/lt.po
index ca5117fdc..92ce4b1c3 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim - A Jabber Instant Messager 0.11.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-08-19 23:55+0200\n"
 "Last-Translator: Mantas Zimnickas <sirexas@yahoo.com>\n"
 "Language-Team: Lithuanian <>\n"
@@ -16,59 +16,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Jabber klientas"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Jungtis į _Grupės Pokalbį..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Įtraukti asmenį..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Ieškoti Paslaugų"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Vykdyti komandą..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Keisti Prieigą"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Atidaryti Gmail paštą"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Asmeniniai Įvykiai"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Pradėti pokalbį..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Būklė"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -78,79 +30,86 @@ msgstr ""
 "\n"
 "Prašome palaukti..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Prašome pasirinkti vieną iš variantų žemiau:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Įveskite jūsų turimos prieigos duomenis</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anoniminė autentikacija"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Prisijungti, kai paspausiu Baigti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Prieigos kūrimo vedlys"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Jau turiu prieigą, kurią noriu _naudoti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Noriu už_registruoti naują prieigą"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Jei pažymėta, Gajim prisimins šios prieigos slaptažodį"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Valdyti..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Joks"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "_Proksis:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Išsaugoti _slaptažodį"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Nustatyti mano profilį, kai prisijungsiu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Naudoti parinktą serverio adresą/prievadą"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -158,146 +117,139 @@ msgstr ""
 "Kad prisijungtumėte privalote turėti prieigą\n"
 "Jabber tinkle."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Papildomas"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Baigti"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Serverio adresas: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Slaptažodis:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Portas:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Serveris:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Įvairūs</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Asmeninė informacija</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+msgid "<b>Proxy</b>"
+msgstr "<i>Proksis</i>"
+
+#: ../data/gui/accounts_window.ui.h:5
+msgid "A_djust to status"
+msgstr "_Nustatyti būklei"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Prieiga"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Prieigos keitimas"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Prieiga"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Administravimo operacijos"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anoniminė autentikaciją"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatiškai bandyti prisijungti, kai prarandamas ryšys"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Prisijungti, kai Gajim pasileis"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "_Keisti slaptažodį"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Jei pažymėsite, Gajim jungsis prie 5223 porto, kur tikimasi, kad serveriai "
-"turi SSL galimybes. Gajim, pagal nutylėjimą naudoja TLS šifravimą jei  "
-"serveris užklausia ir jei ši parinktis yra aktyvi, TLS bus deaktyvuotas"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Pasirinkite _Raktą..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Spauskite, kad pakeisti prieigos slaptažodį"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "_Prisijungti, kai Gajim pasileis"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Prisijungimas"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Keisti asmeninę informaciją..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "El. paštas:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Vardas:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Bendros parinktys"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Serverio adresas: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -305,8 +257,11 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -314,16 +269,7 @@ 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/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Jei pažymėta, Gajim saugos slaptažodį faile ~/.gajim/config su 'tik-"
-"skaitymui' teisėmis, tik Jums"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -331,8 +277,7 @@ msgstr ""
 "Jei pažymėta, po pasileidimo Gajim automatiškai jungsis prie jabber "
 "naudodamas šią prieigą"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -341,47 +286,49 @@ 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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Informacija apie jus, kur yra išsaugota serveryje"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Pavardė:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Apjun_gti prieigas"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Raktas nepasirinktas"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Joks"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Asmeninė informacija"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Prievadas: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "_Prioritetas:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -391,22 +338,20 @@ msgstr ""
 "iš jabber serverio, kai du ar daugiau klientų yra prisijungę prie tos pačios "
 "prieigos; Klientas, turintis aukščiausią prioritetą gaus pranešimus"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritetas keisis automatiškai, priklausomai nuo jūsų būklės."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proksis:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Pe_rvadinti"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Šal_tinis:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -420,197 +365,89 @@ msgstr ""
 "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/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Išsaugoti _slaptafrazę (nesaugu)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Saugoti visų asmenų pokalbių žurnalus"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
 msgstr "Siųsti „aš-gyvas“ paketus"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Sinchronizuoti kontaktus"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Naudoti _SSL (legacy)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Naudoti failų siuntimo proksius"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Nustatyti būklei"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Pavadinimas:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<i>Proksis</i>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "_Nustatyti būklei"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Prieiga"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anoniminė autentikaciją"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "_Prisijungti, kai Gajim pasileis"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "El. paštas:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Vardas:"
-
-#: ../data/glade/accounts_window.glade.h:24
-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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Pavardė:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Apjun_gti prieigas"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Pe_rvadinti"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Siųsti „aš-gyvas“ paketus"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Sinchronizuoti prieigos būklę su globalia būkle"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Sinchronizuoti kontaktus"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Naudoti parinktą serverio adresą/prievadą"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Naudoti parinktą prievadą:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Naudoti failų siuntimo proksius"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Keisti Asmeninę Informaciją..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "Į_jungti"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Serverio adresas: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Valdyti..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Prievadas:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Prieiga:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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ę"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Prijungti naują asmenį"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -622,7 +459,7 @@ msgstr ""
 "protokolo. Jei norite tęsti, spustelkite ant mygtuko\n"
 "registruoti."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -630,595 +467,650 @@ msgstr ""
 "Kad galėtumėte pridėti asmenį iš šio protokolo, turite\n"
 "būti prisijungęs prie perlaidos."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Grupė:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Slapyvardis:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokolas:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registracija"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Įvyko klaida:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Pasirinktie komandą vykdymui:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc Komandos - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Patikrinti dar kartą"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Klaidos aprašymas..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Prašome luktelti, kol atsisiųs komandų sąrašas..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Prašome luktelti, kol siunčiama komanda..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Prašome palaukti..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Ši jabber esybė nepateikė jokių komando."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Aprašymas</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Išplėstinis konfigūracijos redaktorius"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtras:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Trinti MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Ištrins dienos žinutę"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Keisti _Privačiuosius Sąrašus..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Bus išsiųstos žinutės naudotojams, prisijungusiems prie šio serverio"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Nustatyti MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Nustatyti dienos žinutę"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Rodyti _XML konsolę"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Atnaujinti MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Atnaujinti dienos žinutę"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administratorius"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Siųsti Žinutę Serveriui..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr " atidarytas langas/žymė su šiuo asmeniu "
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Veiksmai</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Sąlygos</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Garsai</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Išplėstiniai veiksmai"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Išplėstinis pranešimų valdymas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Visos būklės"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Manęs nėra"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Užsiėmęs "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Nematomas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Paleisti komandą"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Esu išėjęs"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Viena ar daugiau specialių būklių..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Prisijungęs / Laisvas susirašinėti"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Groti garsą"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Atsiųsti žinutę\n"
-"Asmuo atsijungė \n"
-"Asmuo pakeitė būklę \n"
-"Paryškinta žinutė grupės pokalbyje \n"
-"Gauta žinutė grupės pokalbyje \n"
-"Failo atsisiuntimo užklausimas \n"
-"Failo siuntimas pradėtas \n"
-"Failo siuntimas baigtas"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Padaryti, kad pokalbių langas automatiškai neiššoktu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../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/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Uždrausti esmą garsą šiam įvykiui"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Uždrausti įvykių rodyma kantaktų sąraše"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Uždrausti įvykių rodyma sistemos dėkle"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informuok mane su iššokstančiu langu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Atidaryti pokalbio langą su šiuo naudotoju"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Rodyti įvykį kontaktų sąraše"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Rodyti įvykį sistemos dėkle"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "ir aš "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"asmuo(nys)\n"
-"grupė(s)\n"
-"visi"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "dėl "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Įrašas:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Kanalo pavadinimas:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Paskutinį kartą keista:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Gautas naujas įrašas"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Jūs gavote naują įrašą:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Užblokuoti Kontaktai"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Žinutė:</b> "
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Žinutė:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Nuotaika:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Keisti slaptažodį"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Įveskite jį dar kartą, dėl patvirtinimo:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Įveskite naują slaptažodį:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Aktyvumas:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Nuotaika:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Nustatytos žinutės:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Išsaugoti kaip nustatytą..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Prisijungti prie pokalbio grupėje"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "Įtr_aukti į kontaktų sąrašą..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopijuoti JID/El. pašto adresą"
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopijuoti nuorodos adresą"
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Atidaryti el. pašto programą"
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Atverti nuorodą naršyklėje"
+#. 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 "_Siųsti"
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Pradėti pokalbį"
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "Pak_viesti"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "MUC serveris"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../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ę"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Įtraukti Specialų Pranešimą..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Priskirti Open_PGP Raktą..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "_Vykdyti Komandą..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Keisti _Grupes..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "Pak_viesti į"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Kviesti Kontaktus"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "_Trinti"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Siųsti _Parinktą Būklę"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Siųsti ži_nutę..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Siųsti _Failą..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Pradėti _Pokalbį"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Įjungti Abipusį Šifravimą"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Įjungti Open_PGP kodavimą"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "Įtr_aukti į kontaktų sąrašą..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Leisti jam/jai matyti mano būklę"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Drausti jam/jai matyti mano būklę"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Istorija"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Valdyti Kontaktus"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Pervadinti..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Sutikimas"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Nebeignoruoti"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Užpildykite formą."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Kambario nustatymai"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Keisti grupę"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr ""
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Savybės"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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ų"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Atšaukti failo siuntimą"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Atšaukti pažymėtų failų siuntimą"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Išvalyti"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Failų siuntimai"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Slėpti langą"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Pašalinti failo siuntimą iš sąrašo."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1226,75 +1118,74 @@ 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/glade/filetransfers.glade.h:12
+#: ../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  "
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Tęsti"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Pranešti, kai failo siuntimas bus baigtas"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Atidaryti katalogą, kuriame yra failas"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pauzė"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "failų siuntimų sąrašas"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Pokalbių būklės žymių spalvos</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Prieigos eilutė\n"
-"Grupės eilutė\n"
-"Asmens eilutė\n"
-"Pokalbio paveiksliukas"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Prieiga"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Paryškintas"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Kuriama"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Asmuo"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Šrifto stilius:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajim temų keitimas"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Dingo"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Group"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktyvus"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Pasviręs"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1302,7 +1193,7 @@ msgstr ""
 "MUC\n"
 "Žinutės"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1310,109 +1201,73 @@ msgstr ""
 "MUC skirtos\n"
 "Žinutės"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "sustabdytas"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Teksto _spalva:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Teksto šri_ftas:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Fonas:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Keisti _Slapyvardį..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Keisti _Temą..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Keisti Kambario Nustatymus..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "Žy_mės"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Valdyti Kambarį"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_deratorius"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Valdytojo Veiksmai"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Siųsti _Failą"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Įtr_aukti į kontaktų sąrašą"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Adminas"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Banas"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Išspirti"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Dalyvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Savininkas"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Siųsti privačią žinutę"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Balsas"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Kurti naują pranešimą"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Nuo"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Tema"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1422,25 +1277,19 @@ msgstr ""
 "Jei planuojate daryti masinius trynimus, įsitikinkite, kad Gajim yra "
 "išjungtas. Stenkitės netrinti kontaktų su kuriais dabar bendraujate."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Trinti"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Eksportuoti"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Istorijos Žurnalų Valdymas"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1449,391 +1298,415 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Paieška duomenų bazėje"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Contact name"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Groupchats"
+
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Ieškoti:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Registruoti pokalbio istoriją"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr ""
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Browse"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Prisijungti prie pokalbio grupėje"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Slapyvardis:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Slaptažodis:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Nesenai:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Kambarys:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Serveris:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Žy_mės"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Jungtis"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Prieigų valdymas"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Automatinis prsijungimas"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Žymių valdymas"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Rodyti būklę:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Serveris:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Antraštė:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "PEP Paslaugos Konfigūracija"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Konfigūruoti"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr ""
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Savybės</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Nustatymai</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
 msgstr ""
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../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/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Slaptažodis:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Proksi _Serveris:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Proksi _Prievadas:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "_Naudoti HTTP proksi"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Naudoti proksi _autentikaciją"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr ""
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Pavadinimas:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Tipas:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Naudotojo vardas:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Įtraukti šį kontaktą į sąrašą (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Pakviesti kontaktus į pokalbį (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Rodyti formatavimo sąrašą"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Siųsti"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Slapta frazė"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Išplėstinis konfigūracijos redaktorius</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Programos</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Veiksmai</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatinė Būklė</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Pokalbio Išvaizda</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Pokalbio Eilutės Spalvos</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Pokalbio būklės pranešimai</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Sąlygos</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Kitaip</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Šriftas</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail nustatymai</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Nustatytosios būklės žinutės</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<i>Privatumas</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Būklės Žinutės</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Temos</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Antras:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizualinis informavimas</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Išplėstinis"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Išplėstinis..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Visos pokalbių būklės\n"
-"Tik rąšant\n"
-"Uždrausta"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Visos būklės"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Leisti siųsti informaciją apie _OS"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Leisti siųsti informaciją apie _OS"
+
+#: ../data/gui/preferences_window.ui.h:28
 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/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Manęs nėra"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Prašyti įvesti būklės žinutę, kai aš:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
 msgstr ""
-"Automatiškai aptikti, startuojant Gajim\n"
-"Visada naudoti GNOME programas pagal nutylėjimą\n"
-"Visada naudoti KDĘ programas pagal nutylėjimą\n"
-"Visada naudoti Xfce programas pagal nutylėjimą\n"
-"Pasirinktinis"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "_Prisijungti, kai Gajim pasileis"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Būklės pranešimas:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Startuojant tikrinti ar Gajim yra pagrindinis Jabber klientas"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Kuriama"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Nustatyti sąsajos spalvą ir šriftą"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Būklės pranešimas:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Contact name"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Kitaip</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Disabled"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Rodyti kontaktų _aktyvumą sąraše"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Rodyti papildomus _el. pašto duomenis"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Rodyti kontaktų nuotaikas sąraše"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Rodyti asmenų _paveiksliukus kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Rodyti kontaktų nuotaikas sąraše"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Rodyti asmenų _būklės žinutes kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1843,7 +1716,7 @@ msgstr ""
 "kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
 "koduotę rodyti pokalbių languose."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1853,7 +1726,7 @@ msgstr ""
 "kurį galite turėti su kokiu nors asmeniu. Čia jūs galite nurodyti kokią "
 "koduotę išsiųsti kitai šaliai."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1861,36 +1734,36 @@ msgstr ""
 "Gajim rodys pranešimus apie ką tik atsijungusius asmenis iššokančiame "
 "langelyje, dešiniajame apatiniame ekrano kampe"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Slėpti visus mygtukus pokalbio languose"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 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/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Jei pažymėsite, Gajim taip pat įtrauks informaciją apie naujo laiško siuntėją"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1898,7 +1771,7 @@ msgstr ""
 "Jei pažymėta, Gajim rodys asmens paveiksliuką kontaktų sąraše ir pokalbio "
 "lange"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/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"
@@ -1906,29 +1779,35 @@ msgstr ""
 "Jei pažymėta, Gajim rodys žiničių būkles žemiau kontaktinio asmens vardo, "
 "kontaktų sąraše ir pokalbių grupėse"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "Jei pažymėta, Gajim rodys kontaktų aktyvumą sąrašo lange"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr "Jei pažymėta, Gajim rodys kontaktų nuotaiką sąrašo lange"
+
+#: ../data/gui/preferences_window.ui.h:71
 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/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1939,21 +1818,21 @@ msgstr ""
 "kad negausite jokių žinučių iš žmonių, kurie neįtraukti į jūsų kontaktų "
 "sąrašą."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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 ""
 "Jei pažymėsite, Gajim parodys pranešimą, kai gausite naują laišką į GMail"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -1963,13 +1842,13 @@ msgstr ""
 "(pvz.: asmuo iš MSN protokolo turės atitinkamą MSN paveiksliuką būklei "
 "„prisijungęs“, „nuėjęs“, „užimtas“ atvaizduoti... )"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -1977,73 +1856,98 @@ msgstr ""
 "Jei neišjungtas, Gajim automatiškai pakeis tekstines šypsenėles tokias kaip "
 "':)', į atitinkamus animuotus arba statinius paveiksliukus „rožiukus“"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "_Padaryti žinučių langus kompaktiškus"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Val_dyti..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Niekada"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Pranešimai"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Pranešti apie _prisijungusius kontaktus"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Pranešti apie _atsijungusius kontaktus"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Pranešti man apie tai"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Pranešk apie naujus _GMail laiškus"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Asmeniniai Įvykiai"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Groti _garsus"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Rodyk"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Parinktys"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Serveris:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Rodyti tik kontaktų _sąrašą"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Rodyti sisteminį dėklą:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Pr_isijungti"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Atsijungti"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2051,27 +1955,27 @@ msgstr ""
 "Kai kurios žinutės gali turėti formatuotą turinį (pastorinimai, spalvos ir "
 "pan.). Jei pažymėsite, Gajim rodys tiesiog tekstą, be jokių formatavimų."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Rūšiuoti kontaktus pagal būklę"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Būklė"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Būklės _piktogramų rinkinys:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Stilius"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2079,7 +1983,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2087,557 +1991,523 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Naudoti _pernašos piktogramas"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Naudoti sisteminius nustatymus"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Naujam įvykiui įvykus:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Error message: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "B_efore nickname:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Nuėjęs po:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Naršyklė:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "Rodyti _pokalbio būklės pranešimus:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "Šyp_senėlės:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Failų menedžeris:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "Žymėti žodžius su _gramatine klaida"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruoti įvykius nuo asmenų nesančių kontaktų sąraše"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoruoti formatuotą turinį įeinančioms žinutėms"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Registruoti asmenų būklės pakitimus"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_El. pašto programa:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "_Nepasiekiamas po:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Atidaryti..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Grąžinti buvusias spalvas pagal nutylėjimą"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Siųsti pokalbio būklės pranešimus:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Būklės pranešimas:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "pokalbiuose _grupėje"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "_sąraše"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutės"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Privatūs Sąrašai:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Pridėti / Keisti taisyklę</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Taisyklių sąrašas</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Privatus Sąrašas</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktyvus šiai sesijai"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktyvus kiekvieno paleidimo metu"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Visi"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Visi (įskaitant prenumeratas)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Leisti"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Atmesti"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Tvarka:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Privatus sąrašas"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "visus pagal užsisakymą"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "visus grupėje"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"joks\n"
-"abu\n"
-"nuo\n"
-"kam"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Abu"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Nuo"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "vienas"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "du"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "žinučių siuntimui"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "užklausimų siuntimui"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "informavimui mane, apie būklę"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "mano būklės peržiūrai"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresas</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Atvaizdas:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Birthday:</b>"
 msgstr "<b>Gimtadienis:</b>"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Miestas:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Kompanija:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Šalis:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Skyrius:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Pavardė:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Pilnas Vardas</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Duotas:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Asmeninė svetainė:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Antras:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Vardas:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Slapyvardis:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Pareigos:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Titulas:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Vaidmuo:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Valstija:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Gatvė:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sufiksas:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Apie"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Spauskia čia, kad įkeltum savo atvaizdą"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Asmeninė Informacija"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Darbas"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Pašalinti prieigą, _tik iš Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Pašalinti prieigą ir iš Gajim ir iš _serverio"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Trinti"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr ""
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Įtraukti _Kontaktą..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "_Savybės"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Failų _Siuntimai"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Dažniausiai Užduodami Klausimai (prisijungus)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Pagalba tinkle"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profilis, At_vaizdas"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Rodyti Tik _Aktyvius Kontaktus"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Rodyti _Pernašas"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Rodyti _Atsijungusius Asmenis"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Rodyk _Kontaktų Sąrašą"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Prieigos"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Veiksmai"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Turinys"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Redaguoti"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_DUK"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Pagalba"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Nustatymai"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Išjungti"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "_Siųsti Žinutę..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Rodinys"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Palaukite, kol atsisiųs paieškos forma..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Ieškoti"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Įtr_aukti Kontaktą"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Informacija"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Ieškoti"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Eik"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adresas:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registruotis prie"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Atšaukti"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Nuo:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Atsakyti šiai žinutei"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Siųsti"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Siųsti žinutę"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Išsiųsti žinutę ir uždaryti langą"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Kam:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Atsakyti"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Išsiųsti "
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_torizuoti"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2645,175 +2515,190 @@ msgstr ""
 "Drausti autorizacija šiam asmeniui, jis arba ji negalės matyti ar esate "
 "prisijungęs"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Sutikimo užklausimas"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Drausti"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sinchronizuoti : pažymėkite kontaktus"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Išjungti Garsus"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Siųsti Vieną Ži_nutę"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Rodyti Visus Laukiančius Į_vykius"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "_Būklė"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "Pokalbiai _Grupėje"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Klausk:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Klientas:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Kontakto laikas:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Šaltinis:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Būklė:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Prenumerata:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Sistema:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Komentarai"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Nustatytas atvaizdas:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Asmuo"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Asmens Informacija"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Daugiau"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Naudotojo atvaizdas:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Šriftas</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Srautas</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Įvestis</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Įjungti"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Informacija/Užklausa"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "Ži_nutė"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Buvimas"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Keisti Prieigą..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Vietinis jid:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Asmeninis"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Šaltinis:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Būklė:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Jabber klientas"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Atšaukti sutikimą"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -2838,7 +2723,7 @@ msgstr "Integer"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Colour"
 
@@ -2975,180 +2860,180 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Rašybos tikrinimo kalba"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr ""
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/chat_control.py:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Pabraukimas"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Perbraukimas"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Šriftas"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Valyti formatavimą"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Tikrai siųsti failą?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG šifravimas įjungtas"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Ne Sąraše"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Šis kontaktas neturi failų siuntimo funkcijos."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG šifravimas išjungtas"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "ir patvirtintas"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Ši žinutė šifruota"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E šifravimas išjungtas"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Ši žinutė NEBUVO šifruota"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 msgid "The following message was encrypted"
 msgstr "Ši žinutė buvo šifruota"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "You just received a new message from \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3156,125 +3041,135 @@ msgstr ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s dabar %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "creating logs database"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "creating logs database"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim will now exit"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "creating %s directory"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Change status information"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Change status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Set the presence type and description"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Free for chat"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Online"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Extended away"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Do not disturb"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Offline - disconnect"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Presence description:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "The status has been changed."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Leave Groupchats"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s on %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "You have not joined a groupchat."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Groupchats"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Jūs palikote šių grupių pokalbius:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Persiųsti neskaitytas žinutes"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3365,9 +3260,9 @@ msgstr ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "įprastas"
 
@@ -3635,11 +3530,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:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3647,7 +3542,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:230
+#: ../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."
@@ -3655,7 +3550,7 @@ msgstr ""
 "If False, Gajim will no longer print status line in chats when a contact "
 "changes his or her status and/or status message."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3669,29 +3564,29 @@ msgstr ""
 "status messages. If \"in_and_out\", Gajim will only print FOO enters/leaves "
 "group chat."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Background colour of contacts when they just signed in."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Background colour of contacts when they just signed out."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Don't show avatar for the transport itself."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Don't show roster in the system taskbar."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3701,7 +3596,7 @@ msgstr ""
 "window flash (the default behaviour in most Window Managers) when holding "
 "pending events."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3712,7 +3607,7 @@ msgstr ""
 "presences."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3724,31 +3619,31 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Paslėps mygtukus pokalbių languose."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Hides the banner in a group chat window"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Hides the banner in two persons chat window"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 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:251
+#: ../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."
@@ -3756,25 +3651,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Indentation when using merge consecutive nickname."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Lygus žinutės slinkimas pokalbio lange"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr ""
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3782,19 +3677,19 @@ msgstr ""
 "Should we show the confirm metacontacts creation dialogue or not? Empty "
 "string means we never show the dialogue."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3804,7 +3699,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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3812,13 +3707,13 @@ msgstr ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3826,7 +3721,7 @@ msgstr ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3834,67 +3729,83 @@ msgstr ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -3902,78 +3813,83 @@ msgstr ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 workaround"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -3981,125 +3897,130 @@ msgstr ""
 "If ticked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Is OpenPGP enabled for this contact?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Language for which we want to check misspelt words"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "all or space separated status"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', or 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' or ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sleeping"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Back soon"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Back in some minutes."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eating"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "I'm eating, so leave me a message."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Movie"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "I'm watching a movie."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Working"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "I'm working."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Phone"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "I'm on the phone."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Out"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "I'm out enjoying life."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "I'm available."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "I'm free for chat."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Be right back."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "I'm not available."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Do not disturb."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Bye!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4107,103 +4028,95 @@ 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:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Sound to play when any MUC message arrives."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Unable to load idle module"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Wrong host"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../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:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registracija sėkminga"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Registracija nesėkminga"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Nematomumo funkcijos nėra"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Invalid Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nickname not allowed: %s"
@@ -4211,77 +4124,77 @@ msgstr "Nickname not allowed: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Unable to join group chat"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Jūs esate išmestas iš grupės pokalbio %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Tokios grupės pokalbis %s neegzistuoja."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Group chat creation is restricted."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr ""
 "Jūsų užregistruotas slapyvardis turi būti naudojamas grupės pokalbyje %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Jūs estate grupės pokalbio %s narių sąraše."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Kambarys buvo sunaikintas"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "I would like to add you to my roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we are now subscribed to %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "unsubscribe request from %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we are now unsubscribed from %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4418,27 +4331,27 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr ""
 
-#: ../src/common/connection.py:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr ""
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4447,153 +4360,153 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connection with account \"%s\" has been lost"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Reconnect manually."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr ""
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Invalid answer"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Could not connect to \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Check your connection or try again later."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serveris atsakė: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Nepavyko prisijungti prie proksi"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nepavyko prisijungti prie %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr ""
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Check your connection or try again later"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentication failed with \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Please check your login and password for correctness."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Error while removing privacy list"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Siųsti kontaktus:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Not fetched because of invisible status"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Išsiregistruoti nepavyko"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Observers"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transports"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Not in roster"
 
@@ -4602,36 +4515,52 @@ msgstr "Not in roster"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, 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"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Negalima nuskaityti duomenų bazės."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 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:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
+"Try reading %(url)s"
+msgstr ""
+"Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Session bus is not available.\n"
 "Try reading http://trac.gajim.org/wiki/GajimDBus"
@@ -4799,240 +4728,277 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr ""
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr ""
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr ""
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr ""
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Užimtas"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Užimtas"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Nepasiekiamas"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Laisvas Pokalbiams"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Prisijungęs"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Prisijungęs"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Nuėjęs"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "A_tsijungęs"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "N_ematomas"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Būklė nežinoma"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Būklė klaidinga"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Kam"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Abu"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Joks"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Subscribe"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderators"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Participants"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Participant"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Visitors"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Visitor"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "None"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Owner"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Member"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "is paying attention to the conversation"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "is doing something else"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "paused composing a message"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "has closed the chat window or tab"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr ""
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Kambario nustatymai"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5042,17 +5008,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Žinutė pagal nutylėjimą"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Size: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "error: cannot open %s for reading"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migrating logs database to indices"
 
@@ -5689,19 +5712,19 @@ msgstr ""
 msgid "Writing"
 msgstr ""
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5709,12 +5732,12 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5723,7 +5746,7 @@ msgstr ""
 "cancelled."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5791,25 +5814,21 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Error while adding service. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Disabled"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Žinutė pagal nutylėjimą"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Įjungtas"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Dictionary for lang %s not available"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5818,68 +5837,68 @@ msgstr ""
 "You have to install %s dictionary to use spellchecking, or choose another "
 "language by setting the speller_language option."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "status message title"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "status message text"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Relogin now?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr ""
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Unread events"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Read all pending events before removing this account."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "You have opened chat in account %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "You are currently connected to the server"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "To change the account name, you must be disconnected."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Account Name Already Used"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -5887,143 +5906,143 @@ msgstr ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Invalid account name"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Account name cannot be empty."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Account name cannot contain spaces."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Pervadinti Prieigą"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Įveskite naują prieigos %s pavadinimą"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 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:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Invalid entry"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Custom port must be a port number."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Failed to get secret keys"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr ""
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Key Selection"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Choose your OpenPGP key"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "No such account available"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "You are not connected to the server"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Your server doesn't support Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Your server can't save your personal information."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Account Local already exists."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Register to %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Ban List"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Member List"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Owner List"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Administrator List"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Reason"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Role"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Banning..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6031,11 +6050,11 @@ msgstr ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Adding Member..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6043,11 +6062,11 @@ msgstr ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Adding Owner..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6055,11 +6074,11 @@ msgstr ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Adding Administrator..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6067,7 +6086,7 @@ msgstr ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6077,118 +6096,146 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Account name is in use"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Password Required"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Enter your password for account %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Save password"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" is connected to the server"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "If you remove it, the connection will be lost."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Nepavyko prisijungti prie proksi"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "What do you want to do?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Pašalinti prieigą, _tik iš Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Default"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "All"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Enter and leave only"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "None"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "New Group Chat"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "This bookmark has invalid data"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 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:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr ""
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr ""
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr ""
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr ""
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Account has been added successfully"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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."
 msgstr ""
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Your new account has been successfully created"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Invalid username"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "You must provide a username to configure this account."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr ""
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr ""
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6198,7 +6245,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6206,59 +6253,59 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "An error occurred during account creation"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Account name is in use"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "You already have an account using this name."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Active"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Event"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "First Message Received"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr ""
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr ""
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Contact Connected"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Contact Disconnected"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Message Sent"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Group Chat Message Highlight"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Group Chat Message Received"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "GMail E-mail Received"
 
@@ -6275,44 +6322,44 @@ msgid ""
 "last time you paid attention to this group chat"
 msgstr ""
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Cituoti"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Actions for \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Read _Wikipedia Article"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Look it up in _Dictionary"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Search URL is missing an \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Web _Search for it"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Open as _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6320,7 +6367,7 @@ msgstr[0] "Yesterday"
 msgstr[1] "Yesterday"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Subject: %s\n"
@@ -6424,71 +6471,71 @@ msgstr "Yahoo! Address:"
 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Invalid User ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "The user ID must not contain a resource."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr ""
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Contact already in roster"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "This contact is already listed in your roster."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "User ID:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "A GTK+ jabber client"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ Version:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK Version:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Current Developers:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Past Developers:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "THANKS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Jeff Bailes <thepizzaking@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6497,100 +6544,100 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Subscription request from %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "You are already in group chat %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Join Group Chat with account %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr ""
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr ""
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Invalid group chat Jabber ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "The group chat Jabber ID has invalid characters."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "This is not a group chat"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, 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:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr ""
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Chat with account %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Start Chat"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6599,173 +6646,171 @@ msgstr ""
 "to send a chat message to:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Connection not available"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Please make sure you are connected with \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Invalid JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Unable to parse \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Without a connection, you can not change your password."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Invalid password"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "You must enter a password."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Passwords do not match"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "The passwords typed in both fields must be identical."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Contact Signed In"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Contact Signed Out"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "New Message"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "New Single Message"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "New Private Message"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "New E-mail"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "File Transfer Request"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "File Transfer Error"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "File Transfer Completed"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "File Transfer Stopped"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Groupchat Invitation"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Contact Changed Status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Single Message using account %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Single Message in account %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Single Message"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Received %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, python-format
 msgid "Form %s"
 msgstr ""
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s wrote:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console for %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Įtraukti"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Keisti"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Trinti"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6773,151 +6818,151 @@ msgid ""
 msgstr ""
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Įtraukti"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Keisti"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Trinti"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr ""
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupės"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr ""
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Įtr_aukti Kontaktą"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Removes contact from roster"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privacy List <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privacy List for %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr ""
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr ""
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr ""
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr ""
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr ""
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr ""
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr ""
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr ""
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr ""
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Choose Sound"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "All files"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Sounds"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Choose Image"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "When %s becomes:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adding Special Notification for %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Condition"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "when I am "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6925,38 +6970,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6966,77 +7011,77 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Others"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Conference"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Without a connection, you can not browse available services"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Discovery using account %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "The service could not be found"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7044,93 +7089,97 @@ msgstr ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "The service is not browsable"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr ""
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr ""
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Browse"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "This service does not contain any items to browse."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Vykdyti komandą"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gister"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Users"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Description"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "Žy_mės"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Bookmark already set"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Group Chat \"%s\" is already in your bookmarks."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark has been added successfully"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr ""
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr ""
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr ""
 
@@ -7178,7 +7227,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7334,101 +7383,89 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Savybė"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "File"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Time"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progress"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Filename: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "You"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Recipient: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Saved in: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "File transfer completed"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Atidaryti katalogą, kuriame yra failas"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "File transfer cancelled"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Recipient: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Error message: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Failo siuntimas sustabdytas"
 
@@ -7436,7 +7473,7 @@ msgstr "Failo siuntimas sustabdytas"
 msgid "Choose File to Send..."
 msgstr "Choose File to Send..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Aprašymas: "
 
@@ -7468,12 +7505,12 @@ msgstr "Description: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wants to send you a file:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Cannot overwrite existing file \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../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."
@@ -7481,22 +7518,22 @@ msgstr ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "This file already exists"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Directory \"%s\" is not writable"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "You do not have permission to create files in this directory."
 
@@ -7532,71 +7569,55 @@ msgstr "File: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Sender: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Tęsti"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
-msgstr ""
-
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr ""
-
 #: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
-msgstr ""
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
+msgstr "Gajim needs PySQLite2 to run"
 
 #: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr ""
-
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ runtime is missing libglade support"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
+#: ../src/gajim.py:186
+msgid "Gajim needs GTK 2.16 or above"
 msgstr ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
 
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim needs PySQLite2 to run"
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgstr "Gajim needs X server to run. Quiting..."
 
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim needs pywin32 to run"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7606,11 +7627,11 @@ msgstr ""
 "%s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim is already running"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7653,8 +7674,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "account"
 
@@ -7676,12 +7697,15 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, 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 "
 
 #: ../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:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "message"
 
@@ -7909,70 +7933,88 @@ msgstr ""
 "all accounts"
 
 #: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Change status"
+
+#: ../src/gajim-remote.py:270
+msgid "Picture to use"
+msgstr ""
+
+#: ../src/gajim-remote.py:271
+#, fuzzy
+msgid ""
+"Account in which the avatar will be set; if not specified, the avatar will "
+"be set for all accounts"
+msgstr ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+
+#: ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Handle a xmpp:/ uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr ""
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Join a MUC room"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "room"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Kambario JID"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr ""
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "password"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr ""
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Missing argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7981,31 +8023,31 @@ msgstr ""
 "'%s' is not in your roster.\n"
 "Please specify account for sending the message."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "You have no active account"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Arguments:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s not found"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8014,21 +8056,25 @@ msgstr ""
 "Usage: %s command [arguments]\n"
 "Command is one of:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
 "Type \"%(basename)s help %(command)s\" for more info"
 msgstr ""
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr ""
 
@@ -8057,194 +8103,195 @@ msgstr "You cannot delete your current theme"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Sending private message failed"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, python-format
 msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 
-#: ../src/groupchat_control.py:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Insert Nickname"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Pokalbis su "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Pokalbio tęsinys"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr ""
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s has been kicked: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s has been banned: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "You are now known as %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../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:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr ""
 
-#: ../src/groupchat_control.py:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr ""
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1437
+#: ../src/groupchat_control.py:1424
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr ""
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr ""
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 is now %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr ""
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1690
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 
-#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "Do _not ask me again"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr ""
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr ""
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr ""
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr ""
@@ -8263,58 +8310,58 @@ msgstr ""
 msgid "_Report Bug"
 msgstr ""
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr ""
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr ""
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8322,162 +8369,162 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Do you accept this request?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr ""
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr ""
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr ""
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gui_interface.py:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr ""
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Sutikimo užklausimas"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Authorisation accepted"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" removed subscription from you"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr ""
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contact with \"%s\" cannot be established"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 
-#: ../src/gui_interface.py:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "You are currently connected without your OpenPGP key."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Your passphrase is incorrect"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "New mail on %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8487,98 +8534,99 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr ""
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr ""
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Nepavyko iškoduoti žinutės"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Username Conflict"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Please type a new username for your local account"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wants to send you a file."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "File Transfer Request"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8586,15 +8634,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8605,87 +8653,96 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Nesaugus ryšys"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Could not save your settings and preferences"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Passphrase Required"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Please retype your GPG passphrase or press Cancel."
 
@@ -8693,43 +8750,43 @@ msgstr "Please retype your GPG passphrase or press Cancel."
 msgid "_New Group Chat"
 msgstr ""
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr ""
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr ""
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr ""
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr ""
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr ""
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr ""
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -8738,26 +8795,26 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr ""
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "This is an irreversible operation."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
@@ -8796,35 +8853,35 @@ msgstr ""
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr ""
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr ""
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr ""
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Chats"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Group Chats"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Private Chats"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Messages"
 
@@ -8836,22 +8893,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Changed Status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Signed In"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Signed Out"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "New Single Message from %(nickname)s"
@@ -8876,7 +8933,7 @@ msgstr ""
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr ""
 
@@ -8884,18 +8941,18 @@ msgstr ""
 msgid "Retrieving profile..."
 msgstr "Retrieving profile..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr ""
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr ""
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Could not load image"
 
@@ -8927,51 +8984,51 @@ msgstr ""
 "There was an error while publishing your personal information, try again "
 "later."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Apjungtos prieigos"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Authorisation has been sent"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Dabar \"%s\" žinos apie jūsų būklę."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Subscription request has been sent"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Authorisation has been removed"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Now \"%s\" will always see you as offline."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "You will be connected to %s without OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "You are participating in one or more group chats"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -8979,210 +9036,221 @@ msgstr ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Atšaukti failo siuntimą"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "You have unread messages"
 
-#: ../src/roster_window.py:2334
+#: ../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."
 msgstr ""
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, 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:2653
+#: ../src/roster_window.py:2731
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr ""
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr ""
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr ""
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr ""
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr ""
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 msgid "Also remove all contacts in this group from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 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:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:3226
+#: ../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."
 msgstr ""
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, 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:3295
+#: ../src/roster_window.py:3390
 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 
-#: ../src/roster_window.py:3986
+#: ../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."
 msgstr ""
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr ""
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr ""
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr ""
@@ -9192,126 +9260,129 @@ msgstr ""
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr ""
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr ""
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr ""
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr ""
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr ""
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Keisti Būklės Žinutę"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr ""
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+msgid "Publish Location"
+msgstr ""
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Konfigūruoti Paslaugas..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr ""
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Visiems naudotojams"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Visiems prisijungusiems"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr ""
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Redaguoti _Grupes"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Siųsti Vieną Žinutę"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Vykdyti Komandą..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Valdyti Pernašą"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Keisti Pernašą"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Pervadinti"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr ""
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr ""
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "History Manager"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Join New Group Chat"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Change Status Message..."
 
@@ -9346,9 +9417,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9361,143 +9432,153 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Change Status Message..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "_sąraše"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Hide this menu"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Resource: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Last status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " since %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Prisijungta"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Atsijungta"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr ""
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr ""
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr ""
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Padėtis:"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr ""
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr ""
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr ""
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr ""
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr ""
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr ""
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr ""
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr ""
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
 msgstr ""
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "since %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr ""
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9505,7 +9586,7 @@ msgstr ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9513,13 +9594,13 @@ msgstr ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9527,18 +9608,289 @@ msgstr ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " resource with priority "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Jungtis į _Grupės Pokalbį..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Įtraukti asmenį..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Ieškoti Paslaugų"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Vykdyti komandą..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Keisti Prieigą"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Asmeniniai Įvykiai"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Pradėti pokalbį..."
+
+#~ msgid "_Status"
+#~ msgstr "_Būklė"
+
+#~ msgid "Account Modification"
+#~ msgstr "Prieigos keitimas"
+
+#~ 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 ""
+#~ "Jei pažymėsite, Gajim jungsis prie 5223 porto, kur tikimasi, kad "
+#~ "serveriai turi SSL galimybes. Gajim, pagal nutylėjimą naudoja TLS "
+#~ "šifravimą jei  serveris užklausia ir jei ši parinktis yra aktyvi, TLS bus "
+#~ "deaktyvuotas"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Keisti asmeninę informaciją..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Serverio adresas: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Jei pažymėta, Gajim saugos slaptažodį faile ~/.gajim/config su 'tik-"
+#~ "skaitymui' teisėmis, tik Jums"
+
+#~ msgid "Port: "
+#~ msgstr "Prievadas: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proksis:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Išsaugoti _slaptafrazę (nesaugu)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Siųsti „aš-gyvas“ paketus"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Naudoti _SSL (legacy)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Nustatyti būklei"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Trinti MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Siųsti Žinutę Serveriui..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Atsiųsti žinutę\n"
+#~ "Asmuo atsijungė \n"
+#~ "Asmuo pakeitė būklę \n"
+#~ "Paryškinta žinutė grupės pokalbyje \n"
+#~ "Gauta žinutė grupės pokalbyje \n"
+#~ "Failo atsisiuntimo užklausimas \n"
+#~ "Failo siuntimas pradėtas \n"
+#~ "Failo siuntimas baigtas"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "asmuo(nys)\n"
+#~ "grupė(s)\n"
+#~ "visi"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Prisijungti prie pokalbio grupėje"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopijuoti JID/El. pašto adresą"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopijuoti nuorodos adresą"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Atidaryti el. pašto programą"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Atverti nuorodą naršyklėje"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Pradėti pokalbį"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Prieigos eilutė\n"
+#~ "Grupės eilutė\n"
+#~ "Asmens eilutė\n"
+#~ "Pokalbio paveiksliukas"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Keisti _Slapyvardį..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Keisti _Temą..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Keisti Kambario Nustatymus..."
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Valdyti Kambarį"
+
+#~ msgid "Send _File"
+#~ msgstr "Siųsti _Failą"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Įtr_aukti į kontaktų sąrašą"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Siųsti privačią žinutę"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Prieigų valdymas"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Įtraukti šį kontaktą į sąrašą (Ctrl+D)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Pakviesti kontaktus į pokalbį (Ctrl+G)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Rodyti formatavimo sąrašą"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Rodyti šypsenėlių sąrašą (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Visos pokalbių būklės\n"
+#~ "Tik rąšant\n"
+#~ "Uždrausta"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Automatiškai aptikti, startuojant Gajim\n"
+#~ "Visada naudoti GNOME programas pagal nutylėjimą\n"
+#~ "Visada naudoti KDĘ programas pagal nutylėjimą\n"
+#~ "Visada naudoti Xfce programas pagal nutylėjimą\n"
+#~ "Pasirinktinis"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "joks\n"
+#~ "abu\n"
+#~ "nuo\n"
+#~ "kam"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Įtraukti _Kontaktą..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "_Savybės"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Failų _Siuntimai"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profilis, At_vaizdas"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Prieigos"
+
+#~ msgid "_Contents"
+#~ msgstr "_Turinys"
+
+#~ msgid "_FAQ"
+#~ msgstr "_DUK"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Nustatymai"
+
+#~ msgid "_Quit"
+#~ msgstr "_Išjungti"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Siųsti Žinutę..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Siųsti Vieną Ži_nutę"
+
+#~ msgid "Sta_tus"
+#~ msgstr "_Būklė"
+
+#~ msgid "_Group Chat"
+#~ msgstr "Pokalbiai _Grupėje"
+
+#~ msgid "Enable"
+#~ msgstr "Įjungti"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Keisti Prieigą..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Wrong host"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ runtime is missing libglade support"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+
 #~ msgid "_Incoming message:"
 #~ msgstr "Į_einanti žinutė:"
 
@@ -9720,10 +10072,6 @@ msgstr " resource with priority "
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim account %s"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Kitaip</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Duplicate Jabber ID"
 
@@ -9883,9 +10231,6 @@ msgstr " resource with priority "
 #~ msgid "Middle:"
 #~ msgstr "Antras vardas:"
 
-#~ msgid "Position:"
-#~ msgstr "Padėtis:"
-
 #~ msgid "Prefix:"
 #~ msgstr "Kreipinys:"
 
@@ -10056,9 +10401,6 @@ msgstr " resource with priority "
 #~ msgid "Save _position and size for roster and chat windows"
 #~ msgstr "Įsiminti kontakų sąrašo ir pokalbių langų pozicijas ir dydžius"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Rodyti tik kontaktų _sąrašą"
-
 #~ msgid "Use t_rayicon (aka. notification area icon)"
 #~ msgstr "Naudoti piktogramą trėjuje (pranešimų panelės piktograma)"
 
@@ -10073,15 +10415,6 @@ msgstr " resource with priority "
 #~ "įvykiai pasirodys tik jei tai bus nauja žinutė nuo kurio nors asmens, su "
 #~ "kuriuo jūs dar nebuvote pradėjęs pokalbio"
 
-#~ msgid "_Never"
-#~ msgstr "_Niekada"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Pranešti man apie tai"
-
-#~ msgid "_Pop it up"
-#~ msgstr "_Rodyk"
-
 #~ msgid "_Remove from Roster"
 #~ msgstr "Ša_linti iš Kontaktų Sąrašo"
 
@@ -10151,9 +10484,6 @@ msgstr " resource with priority "
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo and Juliet</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Old stories"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Soliloquy"
 
diff --git a/po/nb.po b/po/nb.po
index b0ae93387..e201e5a75 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: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: <>\n"
@@ -16,59 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Bookmarks: -1,775,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+ Jabber klient"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Bli med i _Gruppe Samtale..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Legg til Kontakt..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Oppdag Tjenester"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Kjør Kommando"
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Rediger Konto"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Åpne Gmail Innboks"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Personlige Hendelser"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Start Samtale..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -78,23 +30,23 @@ msgstr ""
 "\n"
 "Vennligst vent..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Vennligst velg ett av valgene under:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Vennligst fyll in data for din eksisterende konto</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Vennligst velg en server</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -102,57 +54,64 @@ msgstr ""
 "Legg til dette sertifikatet til listen over tiltrodde leverandører.\n"
 "SHA1 fingeravtrykk til sertifikatet:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anon_ym autentisering"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Jeg har allerede en konto jeg ønsker å _bruke"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Behandle..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ingen"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Klargjør profilen min når jeg kobler til"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -160,147 +119,141 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Maskinnavn:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "J_ustér etter status"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Konto Endring"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Kontoer"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Administrators oppgaver"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonym autentisering"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Koble til automatisk når kontakten mistes"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Velg denne slik at Gajim vil prøve å koble til port 5223 som gamle servere "
-"forventes å ha SSL muligheter. Merk at Gajim bruker TLS kryptering som "
-"standard dersom dette tilbys av servere, og med dette valget blir TLS "
-"deaktivert."
+"Velg denne slik at Gajim vil spør deg før sending av passordet over en "
+"usikker tilkobling"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Klikk for å forandre kontoens passord"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Klikk for å be om attestering fra alle kontakter av en annen konto"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Ko_ble til når Gajim starter"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Rediger Personlig Informasjon..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "E-Post:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Fornavn:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Generelle"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Maskinnavn:"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -308,8 +261,11 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -317,16 +273,7 @@ msgstr ""
 "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får et "
 "tidsavbrudd som resulterer i frakobling"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet "
-"bare for deg"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -334,8 +281,7 @@ msgstr ""
 "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
 "ved oppstart"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -344,47 +290,49 @@ msgstr ""
 "Dersom valgt vil endringer til global status (håndtert av kombomenyen "
 "nederst i kontaktvinduet) endre status på denne kontoen. "
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Etternavn:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Sammenslåin_g av kontoer"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Ingen"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port:"
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -394,22 +342,20 @@ msgstr ""
 "jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
 "Klienten med den høyeste prioriteten vil få hendelsen"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil endres automatisk etter din status."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Gi _nytt navn"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Ressur_s:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -423,199 +369,89 @@ msgstr ""
 "navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
 "hendelsene. (se under)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Lagre _passord setning (usikkert)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Send hold-i-live meldinger"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Send _hold-i-live pakker"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "_Synkroniser kontakter"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Bruk _SSL (gammel)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Bruk filoverførings proxier"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Justér etter status"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Navn:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "J_ustér etter status"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Kontoer"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anonym autentisering"
-
-#: ../data/glade/accounts_window.glade.h:13
-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"
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Ko_ble til når Gajim starter"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Post:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Fornavn:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Dersom valgt vil Gajim få passordet fra en GPG agent slik som seahorse"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Etternavn:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Sammenslåin_g av kontoer"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Gi _nytt navn"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Send _hold-i-live pakker"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Synkroni_ser konto status med global status"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "_Synkroniser kontakter"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Bruk G_PG Agent"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Bruk egen_definert maskinnavn/port"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Bruk egen_definert port:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Bruk filoverførings proxier"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Rediger Personlig Informasjon..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Slå på"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Maskinnavn:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Behandle..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Advar før benyttelse av en usikker tilkobling"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_bruk HTTP_PROXY system variabel"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "legg til"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-lukk"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-fjern"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Konto"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Legg til ny Kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -627,7 +463,7 @@ msgstr ""
 "protokollen. Klikk på registrer knappen for\n"
 "å fortsette."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -635,409 +471,466 @@ msgstr ""
 "Du må være koblet til transporten for å kunne\n"
 "legge til en kontakt fra denne protokollen."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Kallenavn:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokoll:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registrer"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>En feil har skjedd:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Velg kommando som skal kjøres:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc kommandoer - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Sjekk en gang til"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Feil beskrivelse..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Vennligst vent, henter liste over kommandoer..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Vennligst vent, sender kommandoer..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Denne jabber enheten eksponerer ikke noen kommandoer."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivelse</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Slett MFD (MOTD)"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Rediger _Private Lister..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sender en melding til alle tilkoblede brukere på denne serveren"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Sett MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Oppdater MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Send Server Melding..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Handlinger</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Betingelser</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Lyder</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Avanserte Handlinger"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Instilinger for Hendelsesmeldinger"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Alle statuser"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Borte"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Opptatt "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Kjør en kommando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "En eller flere spesielle statuser..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Pålogget / Ledig for Prat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Spill av en lyd"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Motta en Melding \n"
-"Kontakt ble Frakoblet \n"
-"Kontakt Endret Status \n"
-"Melding i Samtalerom Utheving \n"
-"Melding i Samtalerom Mottatt \n"
-"Filoverførings Forespørsel \n"
-"Filoverføring Startet \n"
-"Filoverføring Ferdig"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Deaktiver automatisk åpning av samtale vindu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Deaktiver eksisterende oppsprett vindu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Deaktiver eksisterende lyd for denne hendelsen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Deaktiver visning av hendelser i kontaktlisten"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Deaktiver visning av hendelser i systemstatusfeltet"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informer meg med et oppspretts vindu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Åpne samtale vindu med bruker"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Vis hendelse i kontaktliste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Vis hendelse i systemstatusfeltet"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "og jeg"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kontakt(er)\n"
-"gruppe(r)\n"
-"alle"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "for "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entry:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Feed navn:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Sist endret:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Ny hendelse motatt"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Du har mottatt en ny inntreden:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blokkerte Kontakter"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Melding:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Sett Aktivitet"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Sett en aktivitet"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Melding:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Stemning:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Endre Passord"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Skriv inn en gang til for verifisering:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Skriv inn nytt passord:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Aktivitet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Humør:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Forvalgte meldinger:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Lagre som Forvalg..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Bli med i _Gruppe Samtale"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Legg til Kontaktliste..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopier JID/E-post Adresse"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopier Link PLassering"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Åpne ny Epost"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Åpne Link i Nettleser"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Start Samtale"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Send"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "In_viter"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Inviter Venner!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "MUC server"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Vennligst velg en MUC server."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1045,187 +938,185 @@ msgstr ""
 "Du kommer nå til å starte en Fler-Bruker Samtale.\n"
 "Velg kontaktene du ønsker å invitere"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Legg til Spesielt _Varsel"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Tilegn Open_PGP Nøkkel..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "K_jør Kommando..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Rediger _Grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Inviter _Kontakter"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Send Enkel _Melding..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Send _Fil..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Velg Egendefinert _Avatar..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Endre Ende til Ende Kryptering"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Endre Open_PGP Kryptering"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Legg til Kontaktliste..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Blokker"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Forby han/henne å se min status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historie"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignorer"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Behandle Kontakt"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Frigi"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Ikke ignorer"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Fyll inn skjemaet."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Rom Instillinger"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESesjon</b> informasjon)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Verifiser"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Funksjonalitet"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Avbryt filoverføring"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Avbryter valgte filoverføring"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Rydd _opp"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Fil Overføringer"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Lukker vinduet"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverføringen fra listen"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1233,75 +1124,74 @@ msgstr ""
 "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil "
 "den først bli stoppet og så fjernet."
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Fortsett"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Åpne Foreldre Katalog"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "fil overførings liste"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Samtalestatus Fane Farger</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Konto rad\n"
-"Gruppe rad\n"
-"Kontakt rad\n"
-"Samtale Banner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Konto"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Fet"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Skriver"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Font stil:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Valg"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Gruppe"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1309,7 +1199,7 @@ msgstr ""
 "MUC\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1317,109 +1207,73 @@ msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pauset"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Tekst _farge:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Tekst _font:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Endre _Kallenavn..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Endre _Tittel..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Konfigurer _Rom..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Bokmerke"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Ødelegg Rom"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Behandle Rom"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimer ved lukking"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "M_odererer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Beboer Handlinger"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Send _Fil"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Legg til Kontaktliste"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Eier"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Send Privat Melding"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Stemme"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Fra"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Tittel"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1429,25 +1283,19 @@ msgstr ""
 "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/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Slett"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Eksport"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Historske Logg Behandler"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1461,402 +1309,420 @@ msgstr ""
 "Bruk dette programmet til å slette eller eksportere logger. Du kan velge "
 "logger fra venstre og/eller søke databasen under."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Søk Databasen"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Skriv inn JID eller Kontakt navn\n"
-"Gruppesamtale Historikk\n"
-"All Samtale Historikk"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Kontakt navn"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Gruppesamtaler"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Søk:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Bokmerke dette rommet"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Utforsk"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Nylig:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Bokmerke dette rommet"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Behandle Kontoer"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Auto bli med"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimer ved Automatisk Deltakelse"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Tittel:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "PEP Service Konfigurasjon"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Konfigurer"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaper</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Proxy _Host:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Proxy _Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Bruk HTTP prox_y"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Bruk proxy aut_entisering"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Navn:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Skriv:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Bokmerke dette rommet (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Søk gjennom samtale historikken (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Endre rommets emne (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Endre ditt _Kallenavn (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Inviter kontakter til samtalen (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Send en fil (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Vis en liste over uttrykksikon (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Vis en liste over formatteringer"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Vis kontaktens profil (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Send"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passord setning"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editering av Avanserte Instillinger</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Applikasjoner</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Handlinger</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatisk Status</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Samtale Utseende</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Samtale Linje Farger</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Samtale status alarmer</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Betingelser</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Egendefinert</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Font</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail Valg</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<i>Privatliv</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Status Meldinger</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Temaer</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Mellomnavn:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Alle samtale statuser \n"
-"Bare komponering \n"
-"Deaktivert"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Alle statuser"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Tillat _OS informasjon å bli sendt"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Tillat lys når jeg er _opptatt"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Borte"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Autodetektér hver gang Gajim starter\n"
-"Alltid bruk GNOME standard applikasjoner\n"
-"Alltid bruk KDE standard applikasjoner\n"
-"Alltid bruk Xfce standard applikasjoner\n"
-"Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "K_oble til når Gajim starter"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Samtale melding:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Sjekk ved oppstart om Gajim er _standard Jabber klient"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Skriver"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Konfigurer farge og font for grensesnittet"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Samtale melding:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontakt navn"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Egendefinert"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
 msgstr ""
-"Frakoblet kontaktliste med frakoblede samtaler\n"
-"Frakoblet kontaktliste med enkelt samtaler\n"
-"Ett vindu til alt\n"
-"Frakoblet kontaktliste med samtaler gruppert etter konto\n"
-"Frakoblet kontaktliste med samtaler gruppert etter type"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Deaktivert"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Vis _aktivitet til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Vis h_umør til kontakter i kontaktlisten"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis _sanger til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1866,7 +1732,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1876,7 +1742,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1884,11 +1750,11 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Gjem alle knapper i samtale vinduer"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1896,20 +1762,20 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Dersom valgt vil Gajim endre status til Borte når maskinen ikke brukes."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1917,7 +1783,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1925,7 +1791,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1933,25 +1799,31 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise aktivitet for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise sanger som kontakter spiller i kontaktliste "
 "vinduet"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1961,7 +1833,7 @@ msgstr ""
 "Dersom ikke noe språk er valgt med høyreklikking i feltet vil standard "
 "språkvalg brukes for denne kontakten eller gruppesamtale."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1971,7 +1843,7 @@ msgstr ""
 "kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
 "kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -1981,14 +1853,14 @@ msgstr ""
 "husk at når man bruker E2E kryptering må den andre parten være enig i at "
 "logging er OK, ellers vil ikke beskjeder logges."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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 ""
 "Dersom valgt vil Gajim vise en melding når en ny e-post mottas fra GMail"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -1997,7 +1869,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2005,7 +1877,7 @@ msgstr ""
 "Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
 "beskjed vil benyttes isteden."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2013,79 +1885,102 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Logg _krypterte samtale sesjoner"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Gj_ør meldings vinduet kompakt"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Aldri\n"
-"Bare når hendelser venter\n"
-"Alltid"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Aldri"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Kunngjøringer"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Gi meg beskjed om det"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Alarmér om nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Aldri\n"
+"Bare når hendelser venter\n"
+"Alltid"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Personlige Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
-"Sprett opp\n"
-"Varsle meg om det\n"
-"Vis bare i kontaktlisten"
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Sprett opp"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Vis bare i _kontaktliste"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Vis systemstatus:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2093,27 +1988,27 @@ msgstr ""
 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
 "valgt vil Gajim kun vise rå meldings tekst."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Standard _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2125,7 +2020,7 @@ msgstr ""
 "$S byttes ut av tidligere status melding\n"
 "$T byttest ut av automatisk-borte tidsavbrudd"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2137,366 +2032,381 @@ msgstr ""
 "$S vil byttes ut av forrige status melding\n"
 "$T vil byttes ut av automatisk-ikke-tilgjengelig tidsavbrudd"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Bruk _transport ikoner"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Bruk systemets _standardinstillinger"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Når en ny hendelse blir motatt:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Feil melding: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Borte etter:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Vis samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "_Ikke tilgjengelig etter:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Send Samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "_URL utheving:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "i _gruppe samtale"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutter"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste over Uønskede:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Legg til / Endre regel</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Regelliste</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Liste over Uønskede</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktiv for denne sesjonen"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktiv på hver oppstart"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Alle"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Alle (inkludert abonnement)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Tillate"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "alle etter abonnement"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "alle i gruppen"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ingen\n"
-"begge\n"
-"fra\n"
-"til"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Begge"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Fra"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "en"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "to"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "å sende meg meldinger"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "å sende meg forespørsler"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "å sende meg status"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "å se min status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresse</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>By:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Avdeling:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Etternavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Fullt Navn</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Fornavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Hjemmeside:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Mellomnavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Navn:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Kallenavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Stilling:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Rolle:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Stat:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Gate:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffiks:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Om"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Klikk for å sette ditt kontaktbilde"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Personlig Info"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Jobb"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2504,192 +2414,143 @@ msgstr ""
 "<b>noen@etsted.no</b> ønsker at du skal <b>legge til</b> noen kontakter i "
 "kontaktlisten din."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../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/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Kontaktliste Element Utveksling"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "Avbryt"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Legg til _Kontakt..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Fun_ksjoner"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Fil _Overføringer"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Ofte Stilte Spørsmål (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Hjelp online"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil, B_ilde"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Vis Bare _Aktive Kontakter"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Kontoer"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Innhold"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Instillinger"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Avslutt"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "_Send Enkeltmelding..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Vis"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Vennligst vent, henter søke skjemaet..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Søk"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "G_å"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registrer til:"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Fra:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Svar på denne meldingen"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Send melding"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Send melding og lukk vinduet"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Til:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Go_dkjenn"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2697,175 +2558,190 @@ msgstr ""
 "Avslå godkjenning fra kontakt så han eller henne ikke kan se når du er "
 "tilkoblet"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Abonnerings Forespørsel"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Velg hvilken konto du du ønsker å synkronisere med"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 msgid "Select the contacts you want to synchronise"
 msgstr "Velg kontaktene du ønsker å synkronsiere"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synkroniser : velg kontakter"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Slå av Lyder"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Send _Melding"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Gruppe Samtale"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Spør:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Kontakt tid:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressurs:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abbonement:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Konfigurert avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Mer"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Bruker avatar:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikk</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Slå på"
+#: ../data/gui/xml_console_window.ui.h:4
+msgid "Hide IN stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:5
+msgid "Hide IQ stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Informasjon/Spørring"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Rediger Konto..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lokal jid:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Personlige"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "En GTK+ Jabber klient"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Tjenesten sendte ødelagte data"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Tjenesten endret sesjons identifikasjon. "
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
@@ -2890,7 +2766,7 @@ msgstr "Nummer"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Farge"
 
@@ -3027,85 +2903,85 @@ msgstr "Svensk"
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Understrek"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Streik"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Fjern formattering"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Ikke i kontaktliste"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Denne kontakten støtter ikke filoverføring."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3113,50 +2989,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3165,23 +3041,23 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3189,25 +3065,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3215,15 +3091,15 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3232,110 +3108,120 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "lager logg database"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Endre statusinformasjon"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Endre status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Sett fraværstype og beskrivelse"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Ledig for samtale"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Utvidet borte"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Frakoblet - ikke kontakt"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Statusen har blitt endret."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Gå ut av Gruppesamtale"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s fra %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Du har ikke blitt med i en gruppesamtale."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Du gikk ut av følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Videresend uleste meldinger"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Alle uleste meldinger har blitt videresendt."
 
@@ -3429,9 +3315,9 @@ msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "standard"
 
@@ -3719,12 +3605,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:228
+#: ../src/common/config.py:229
 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:229
+#: ../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."
@@ -3732,7 +3618,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:230
+#: ../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."
@@ -3740,7 +3626,7 @@ msgstr ""
 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3753,29 +3639,29 @@ msgstr ""
 "hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
 "Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 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:234
+#: ../src/common/config.py:235
 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:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis kontaktbilde for transporten selv."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3785,7 +3671,7 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3796,7 +3682,7 @@ msgstr ""
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3817,31 +3703,31 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Gjemmer knappene i samtale vinduer."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3849,15 +3735,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Jevn tekstrulling av meldinger i samtale vinduene"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3865,11 +3751,11 @@ msgstr ""
 "Liste av farger, separert av \":\", som vil bli brukt til å farge kallenavn "
 "i gruppesamtaler."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3877,7 +3763,7 @@ msgstr ""
 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
 "innhold mener at vi aldri viser dialogen."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3885,7 +3771,7 @@ msgstr ""
 "Skal vi vise bekrefte blokk kontakt dialog eller ikke? Tomt tekststreng "
 "betyr at vi aldri viser dialogen."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3893,7 +3779,7 @@ msgstr ""
 "Skal vi vise bekrefte egendefinert status dialog eller ikke? Tomt "
 "tekststreng betyr at vi aldri viser dialogen."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3903,7 +3789,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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3911,7 +3797,7 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3919,7 +3805,7 @@ msgstr ""
 "Dersom True vil Gajim bruke KDE Wallet (dersom kwalletcli er tilgjengelig) "
 "til å lagre konto passord."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3927,7 +3813,7 @@ msgstr ""
 "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
 "og gruppe rader. "
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3935,7 +3821,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Dersom ikke tom, behandle alle "
 "innkommende meldinger som om de var av denne typen."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3943,7 +3829,7 @@ msgstr ""
 "Dersom True vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3951,18 +3837,18 @@ 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:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tif med inaktivitet som behøves før endre status vinduet lukkes."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3970,11 +3856,11 @@ msgstr ""
 "Dersom True vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Velg intervall mellom 2 punkter av ledighet."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3982,7 +3868,7 @@ msgstr ""
 "Endre verdien for å endre størrelsen på lateks formlene som vises. Høyrere "
 "er større."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -3990,7 +3876,7 @@ 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:272
+#: ../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!"
@@ -3999,13 +3885,13 @@ msgstr ""
 "tilkobling til en konto etableres. ADVARSEL: Dette forårsaker mange "
 "forespørsler!"
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 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:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4013,7 +3899,23 @@ msgstr ""
 "Når skal selv kontakt raden vises. Kan være \"always\",\"when_other_resource"
 "\" eller \"never\""
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4021,7 +3923,7 @@ msgstr ""
 "Prioritet vil endre automatisk i følge med din status. Prioritetene "
 "defineres i autopriority_* valgene."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4030,39 +3932,39 @@ msgstr ""
 "borte, xa, ikke forstyrr, usynlig. MERK: dette valget brukes bare dersom "
 "restore_last_status er deaktivert"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Dersom valgt, gjenopprett siste status brukt."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 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:298
+#: ../src/common/config.py:308
 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:301
+#: ../src/common/config.py:311
 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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne kontoen."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 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:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4070,29 +3972,36 @@ msgstr ""
 "Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. Kan "
 "inneholde tls, ssl eller plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 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:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Mellomrom sendt etter inaktivitet"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sendt etter inaktivitet"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4101,11 +4010,11 @@ msgstr ""
 "prøver å koble til på nytt."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4113,15 +4022,15 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4129,11 +4038,16 @@ msgstr ""
 "Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
 "meldinger skal logges?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4141,101 +4055,101 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' eller ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4244,58 +4158,50 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Feil maskinnavn"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Ugyldig lokal adresse? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, 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:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registrering vellykket"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s var vellykket"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Registrering feilet"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4303,39 +4209,39 @@ msgstr ""
 "Registrering med agenten %(agent)s feilet med melding %(error)s: %(error_msg)"
 "s"
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 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:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4344,7 +4250,7 @@ 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:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
@@ -4352,76 +4258,76 @@ msgstr "Kallenavn ikke lovlig: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Maksimum antall brukere for %s er nådd"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Rommet har blitt ødelagt"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4559,16 +4465,16 @@ msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 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:259
+#: ../src/common/connection.py:274
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4576,11 +4482,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4589,77 +4495,77 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarte: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, 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:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4668,7 +4574,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4677,24 +4583,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4703,43 +4609,43 @@ 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Sendt kontakter:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Avregistrering feilet"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, 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:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
@@ -4748,38 +4654,51 @@ msgstr "ikke i kontaktliste"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus fungerer ikke riktig på denne maskinen"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "D-Bus fungerer ikke riktig på denne maskinen"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Databasen kan ikke leses."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
 "til False"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr "Sesjons buss ikke tilgjengelig"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Sesjons bussen er ikke tilgjengelig.\n"
 "Prøv å les http://trac.gajim.org/wiki/GajimDBus"
@@ -4947,240 +4866,277 @@ msgstr "Slutten av uken"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr "fra rom %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr "fra bruker %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr "fra %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, 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:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Rom Instillinger"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+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"
@@ -5190,17 +5146,74 @@ msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldig loggnivå"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Standard Melding"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Størrelse: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
@@ -5837,19 +5850,19 @@ msgstr "Studerer"
 msgid "Writing"
 msgstr "Skriver"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Ukjent Artist"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Ukjent Tittel"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Ukjent Kilde"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5859,12 +5872,12 @@ msgstr ""
 "fra  <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5873,7 +5886,7 @@ msgstr ""
 "avbrutt."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5944,24 +5957,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Deaktivert"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5970,69 +5979,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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kan ikke brukes på denne maskinen"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6040,143 +6049,143 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Det er ingen OpenPGP hemmelig nøkkel tilgjengelig."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "For å deaktivere kontoen, må du være tilkoblet."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6184,11 +6193,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6196,11 +6205,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6208,11 +6217,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6220,7 +6229,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6236,85 +6245,113 @@ msgstr ""
 "4. domene (domene selv treffer, samt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser som inneholder et underdomene)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Uttryksikoner avslått"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Tilkobling til proxy feilet"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Hva ønsker du å gjøre?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Fjern kontoe _bare fra Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 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:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Tegn ikke lovlig"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Ugyldig rom"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6324,33 +6361,33 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6365,7 +6402,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6376,59 +6413,59 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
@@ -6450,44 +6487,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:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Sitat"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6495,7 +6532,7 @@ msgstr[0] "I går"
 msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
@@ -6602,71 +6639,71 @@ 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6679,101 +6716,101 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6782,173 +6819,171 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Lei seg"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6956,153 +6991,153 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Legg til"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Slett"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Legg til kontakt"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 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:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7113,19 +7148,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7135,19 +7170,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7162,23 +7197,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7187,7 +7222,7 @@ msgstr ""
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7195,52 +7230,52 @@ msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7248,93 +7283,97 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Bokmerke"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
@@ -7385,7 +7424,7 @@ msgstr "Krever python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Funksjon ikke tilgjengelig i Windows."
 
@@ -7549,103 +7588,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Krever python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Faner og klikkbare linker"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-"Muligheten for å ha klikkbare URLer i samtale og gruppesamtale vindu faner."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Krever python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Krever python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Funksjonalitet"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Åpne Foreldre Katalog"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Fil overføring avbrutt"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottaker:  %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Fil overføring stoppet"
 
@@ -7653,7 +7679,7 @@ msgstr "Fil overføring stoppet"
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Beskrivelse:"
 
@@ -7685,12 +7711,12 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../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."
@@ -7698,22 +7724,22 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
@@ -7749,70 +7775,56 @@ msgstr "Fil: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Fortsett"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importering av PyGTK feilet: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim trenger PyGTK 2.12 eller høyere"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.12 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim trenger GTK 2.12 eller høyere"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.12 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ mangler libglade støtte"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
-"versjon fra %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim trenger PySQLite2 for å kjøre"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7822,11 +7834,11 @@ msgstr ""
 "på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7869,8 +7881,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "konto"
 
@@ -7892,14 +7904,17 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "melding"
 
@@ -8133,70 +8148,89 @@ msgstr ""
 "til alle kontoer"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI til håndgrep"
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Meldings innhold"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "passord"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8205,15 +8239,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ut som Gajim ikke kjører, så du kan ikke bruke gajim-remote. "
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8222,16 +8256,16 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8240,7 +8274,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8249,7 +8283,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8258,7 +8292,11 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Feil uri"
 
@@ -8287,176 +8325,177 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 er nå %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8464,22 +8503,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -8500,58 +8539,58 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Rapporter Feil"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8562,58 +8601,58 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 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:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Abonnerings forespørsel"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8621,59 +8660,59 @@ 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Fjern Abonnement"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, 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:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Romet er nå full-anonymisert"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
@@ -8681,23 +8720,23 @@ msgstr ""
 "Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
 "som kjører eller den returnerte feil passord frase.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG Passordord er ikke riktig"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG nøkkel ikke tiltrodd"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8705,27 +8744,28 @@ msgstr ""
 "GPG nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
 "virkelig å kryptere denne meldingen?"
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8740,42 +8780,42 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Kontakten stoppet overføring"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Feil under åpning av fil"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8784,36 +8824,36 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Feil."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8821,21 +8861,22 @@ msgstr ""
 "Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
 "et annet"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8846,15 +8887,15 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8871,23 +8912,28 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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 skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
-"at du ønsker å gjøre det?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker å koble til usikkert"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -8896,21 +8942,30 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
+"at du ønsker å gjøre det?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "PEP noden ble ikke fjernet"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8918,7 +8973,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: ../src/gui_interface.py:2570
+#: ../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 "
@@ -8928,40 +8983,40 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG nøkkel utgått"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG nøkkel er utgått, du vil bli koblet til %s uten OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
@@ -8969,43 +9024,43 @@ msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9019,26 +9074,26 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9077,35 +9132,35 @@ msgstr "Status er nå: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Du kommer til å lukke flere tabber"
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Ønsker du virkelig å lukke alle?"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -9117,22 +9172,22 @@ msgstr "- meldinger vil bli logget"
 msgid "- messages will not be logged"
 msgstr "- -meldinger vil ikke bli logget"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
@@ -9157,7 +9212,7 @@ msgstr "Melding fra %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -9165,18 +9220,18 @@ msgstr "Ignorer"
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
@@ -9208,53 +9263,53 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9262,27 +9317,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Virkelig avslutte Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på at du vil avslutte Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Alltid lukk Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Avbryt filoverføring"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9290,16 +9356,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:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9307,11 +9373,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9320,12 +9386,12 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 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:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9334,57 +9400,57 @@ msgstr ""
 "sender deg."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9393,11 +9459,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9405,16 +9471,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9424,35 +9490,36 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 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:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9460,13 +9527,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:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9476,23 +9543,23 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -9502,126 +9569,130 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Publiser Sang"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Koble til på nytt"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -9652,13 +9723,13 @@ msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "The andre klienten ønsker å forhandle en sesjon med disse funksjonene:\n"
 "\n"
@@ -9681,116 +9752,126 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "i _kontaktliste"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [blokkert]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimert]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Siste status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Sang:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Varslinger"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9798,28 +9879,28 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Time:Ukjent"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9827,7 +9908,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9835,13 +9916,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9849,18 +9930,375 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Bli med i _Gruppe Samtale..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Legg til Kontakt..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Oppdag Tjenester"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Kjør Kommando"
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Rediger Konto"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Personlige Hendelser"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Start Samtale..."
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Konto Endring"
+
+#~ 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 ""
+#~ "Velg denne slik at Gajim vil prøve å koble til port 5223 som gamle "
+#~ "servere forventes å ha SSL muligheter. Merk at Gajim bruker TLS "
+#~ "kryptering som standard dersom dette tilbys av servere, og med dette "
+#~ "valget blir TLS deaktivert."
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Rediger Personlig Informasjon..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Maskinnavn:"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' "
+#~ "rettighet bare for deg"
+
+#~ msgid "Port: "
+#~ msgstr "Port:"
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Lagre _passord setning (usikkert)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Send hold-i-live meldinger"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Bruk _SSL (gammel)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Justér etter status"
+
+#~ msgid "gtk-add"
+#~ msgstr "legg til"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-lukk"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-fjern"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Slett MFD (MOTD)"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Send Server Melding..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Motta en Melding \n"
+#~ "Kontakt ble Frakoblet \n"
+#~ "Kontakt Endret Status \n"
+#~ "Melding i Samtalerom Utheving \n"
+#~ "Melding i Samtalerom Mottatt \n"
+#~ "Filoverførings Forespørsel \n"
+#~ "Filoverføring Startet \n"
+#~ "Filoverføring Ferdig"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontakt(er)\n"
+#~ "gruppe(r)\n"
+#~ "alle"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Bli med i _Gruppe Samtale"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopier JID/E-post Adresse"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopier Link PLassering"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Åpne ny Epost"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Åpne Link i Nettleser"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Start Samtale"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Konto rad\n"
+#~ "Gruppe rad\n"
+#~ "Kontakt rad\n"
+#~ "Samtale Banner"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Endre _Kallenavn..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Endre _Tittel..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Konfigurer _Rom..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Ødelegg Rom"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Behandle Rom"
+
+#~ msgid "Send _File"
+#~ msgstr "Send _Fil"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Legg til Kontaktliste"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Send Privat Melding"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Skriv inn JID eller Kontakt navn\n"
+#~ "Gruppesamtale Historikk\n"
+#~ "All Samtale Historikk"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Behandle Kontoer"
+
+#~ msgid "gtk-delete"
+#~ msgstr "delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Bokmerke dette rommet (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Søk gjennom samtale historikken (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Endre rommets emne (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Endre ditt _Kallenavn (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Send en fil (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Vis en liste over uttrykksikon (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Vis en liste over formatteringer"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Vis kontaktens profil (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Alle samtale statuser \n"
+#~ "Bare komponering \n"
+#~ "Deaktivert"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Autodetektér hver gang Gajim starter\n"
+#~ "Alltid bruk GNOME standard applikasjoner\n"
+#~ "Alltid bruk KDE standard applikasjoner\n"
+#~ "Alltid bruk Xfce standard applikasjoner\n"
+#~ "Egendefinert"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Frakoblet kontaktliste med frakoblede samtaler\n"
+#~ "Frakoblet kontaktliste med enkelt samtaler\n"
+#~ "Ett vindu til alt\n"
+#~ "Frakoblet kontaktliste med samtaler gruppert etter konto\n"
+#~ "Frakoblet kontaktliste med samtaler gruppert etter type"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Sprett opp\n"
+#~ "Varsle meg om det\n"
+#~ "Vis bare i kontaktlisten"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ingen\n"
+#~ "begge\n"
+#~ "fra\n"
+#~ "til"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Legg til _Kontakt..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Fun_ksjoner"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Fil _Overføringer"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil, B_ilde"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Kontoer"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innhold"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Instillinger"
+
+#~ msgid "_Quit"
+#~ msgstr "_Avslutt"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Send Enkeltmelding..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Send _Melding"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Gruppe Samtale"
+
+#~ msgid "Enable"
+#~ msgstr "Slå på"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Rediger Konto..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Feil maskinnavn"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Ugyldig lokal adresse? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr ""
+#~ "pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. "
+#~ "Avslutter..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Faner og klikkbare linker"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Muligheten for å ha klikkbare URLer i samtale og gruppesamtale vindu "
+#~ "faner."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Krever python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ mangler libglade støtte"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Vennligst fjern din gjeldende GTK+ installasjon og installer siste "
+#~ "stabile versjon fra %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim trenger PySQLite2 for å kjøre"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Innkommende melding:"
 
@@ -10081,12 +10519,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim konto %s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#~ msgid "Custom"
-#~ msgstr "Egendefinert"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Duplikat Jabber ID"
 
@@ -10190,9 +10622,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo og Julie</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Gamle historier"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Enetale"
 
@@ -10308,9 +10737,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "Sett status til å vise navnet på _musikk som spilles"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Vis bare i _kontaktliste"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Den automatiserte borte meldinen"
 
@@ -10344,18 +10770,9 @@ msgstr " ressurs med prioritet"
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Avanserte Innstillinger for Hendelsesmeldinger..."
 
-#~ msgid "_Never"
-#~ msgstr "_Aldri"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Gi meg beskjed om det"
-
 #~ msgid "_Player:"
 #~ msgstr "_Spiller:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Sprett opp"
-
 #~ msgid "Address"
 #~ msgstr "Adresse"
 
@@ -10655,9 +11072,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Size: "
 #~ msgstr "Størrelse: "
 
-#~ msgid "Session bus is not available"
-#~ msgstr "Sesjons buss ikke tilgjengelig"
-
 #~ msgid "Sound"
 #~ msgstr "Lyd"
 
diff --git a/po/nl.po b/po/nl.po
index db0bb63a9..438604159 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -18,66 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-# 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
-msgid "A GTK+ Jabber client"
-msgstr "Een GTK+ Jabber client"
-
-#: ../data/gajim.desktop.in.in.h:2
-msgid "Gajim Instant Messenger"
-msgstr ""
-
-#: ../data/gajim.desktop.in.in.h:3
-msgid "Jabber IM Client"
-msgstr "Jabber IM Client"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
-msgid "Join _Group Chat..."
-msgstr "Neem deel aan _Groepsgesprek"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Contact Toevoegen..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "Ontdek Services"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr ""
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "Account Be_werken..."
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Open Email Samensteller"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Persoonlijke Informatie"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Start Gesprek"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -88,84 +34,91 @@ msgstr ""
 "\n"
 "Een ogenblik geduld..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Kies een van de volgende opties:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, 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/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Gebruik aanmelding"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Verbind zodra ik Afronden druk"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Wizard Account Aanmaken"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Ik heb al een account die ik wil gebruiken"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Ik wil een nieuwe account _registreren"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Indien aangevinkt zal Gajim het wachtwoord onthouden voor deze account"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Beheer..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Geen"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Sla _wachtwoord op"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 #, fuzzy
 msgid "Set my profile when I connect"
 msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Gebruik aangepaste hostnaam/poort"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -173,156 +126,158 @@ msgstr ""
 "Je hebt een account nodig om verbinding te maken\n"
 "met het Jabber netwerk."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "Gea_vanceerd"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Afronden"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Hostnaam: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Overige</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Persoonlijke Informatie</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Eigenschappen</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, 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"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Account Wijziging"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Accounts"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "_Administrator"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Gebruik aanmelding"
+
+#: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatisch verbinding herstellen als deze verbroken wordt"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Automatisch _verbinding maken als Gajim opstart"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Verander Wachtwoord"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Vink dit aan als je wilt dat Gajim verbinding maakt met SSL over poort 5223. "
-"Let op, deze functionaliteit werkt mogelijk alleen bij oudere servers. Gajim "
-"gebruikt standaard al TLS waar mogelijk. Deze optie schakelt TLS echter uit."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Kies _Sleutel..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Klik om het wachtwoord van de account te veranderen"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "Automatisch _verbinding maken als Gajim opstart"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Verbinding"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Wijzig Persoonlijke Informatie..."
+#: ../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
+#, fuzzy
+msgid "First Name:"
+msgstr "Naam:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Algemeen"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Hostnaam: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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 ""
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, 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:26
 #, fuzzy
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
@@ -331,16 +286,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim keep-alive-paketten sturen om de verbinding in "
 "stand te houden"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Indien aangevinkt zal Gajim wachtwoorden opslaan in ~/.gajim/config met "
-"alleen leesrechten voor allen jou"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -348,8 +294,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim automatisch verbinding maken met deze account "
 "bij het opstarten"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -359,47 +304,48 @@ msgstr ""
 "lijstknop onderaan het roostervenster) de status van deze account "
 "meeveranderen."
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Informatie over jou, zoals op de server opgeslagen"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+#, fuzzy
+msgid "Last Name:"
+msgstr "Naam:"
+
+#: ../data/gui/accounts_window.ui.h:34
+#, fuzzy
+msgid "Mer_ge accounts"
+msgstr "Accounts _samenvoegen"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Geen"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Poort: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_teit"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -409,23 +355,21 @@ msgstr ""
 "ontvangt als er twee keer op dezelfde account ingelogd is; de hoogste  "
 "prioriteit wint."
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Her_noem"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "_Bron: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -438,216 +382,102 @@ msgstr ""
 "met zowel met een bron 'Thuis' als een bron 'Werk' ingelogd te zijn. De "
 "prioriteit bepaald dan wie berichten ontvangt. (zie hieronder)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Sla _wachtwoord op (onveilig)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Sla gespreks_logboek op voor alle contacten"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Keep-alive-pakketten verzenden"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_roniseer account status met globale status"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "_Offline Contacten Weergeven"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Gebruik _SSL (verouderd)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-#, fuzzy
-msgid "Use file transfer proxies"
-msgstr "bestandsoverdrachtlijst"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr ""
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-#, fuzzy
-msgid "_Name:"
-msgstr "_Naam: "
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Eigenschappen</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Accounts"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Gebruik aanmelding"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "Automatisch _verbinding maken als Gajim opstart"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#, fuzzy
-msgid "First Name:"
-msgstr "Naam:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, 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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#, fuzzy
-msgid "Last Name:"
-msgstr "Naam:"
-
-#: ../data/glade/accounts_window.glade.h:34
-#, fuzzy
-msgid "Mer_ge accounts"
-msgstr "Accounts _samenvoegen"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Her_noem"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Keep-alive-pakketten verzenden"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Synch_roniseer account status met globale status"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "_Offline Contacten Weergeven"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Gebruik aangepaste hostnaam/poort"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Gebruik aangepaste hostnaam/poort"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "bestandsoverdrachtlijst"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Wijzig Persoonlijke Informatie..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Inschakelen"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Hostnaam: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Beheer..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Poort:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 #, fuzzy
 msgid "A_ccount:"
 msgstr "Account"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Nieuwe Contact Toevoegen"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -655,657 +485,721 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Groep:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 #, fuzzy
 msgid "_Nickname:"
 msgstr "Bijnaam:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protocol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 #, fuzzy
 msgid "_Register"
 msgstr "Re_gistreer"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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
 #, fuzzy
 msgid "_User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../data/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 #, fuzzy
 msgid "<b>An error has occurred:</b>"
 msgstr "Een protocolfout is opgetreden:"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
 msgid "Error description..."
 msgstr "Beschrijving"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 #, fuzzy
 msgid "Please wait while retrieving command list..."
 msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 #, fuzzy
 msgid "Please wait while the command is sending..."
 msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr ""
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Beschrijving</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Geavanceerde Configuratie Wijzigen"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Wis MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Zal het Bericht van de Dag wissen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Start Gesprek"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr "Stuurt een bericht naar gebruikers momenteel verbonden met deze server"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Stel MOTD in"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Stelt het Bericht van de Dag in"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "_XML Console Weergeven"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "MOTD Bijwerken"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Werkt Bericht van de Dag bij"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "Ver_stuur Server Bericht"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 #, fuzzy
 msgid "<b>Actions</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 #, fuzzy
 msgid "<b>Conditions</b>"
 msgstr "<b>Geluiden</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Geluiden</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 #, fuzzy
 msgid "Advanced Actions"
 msgstr "Gea_vanceerde Acties"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Geavanceerde Configuratie Wijzigen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 #, fuzzy
 msgid "All statuses"
 msgstr "Status: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Afwezig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Bezig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 #, fuzzy
 msgid "Launch a command"
 msgstr "commando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Niet Beschikbaar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Open voor Gesprek"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 #, fuzzy
 msgid "Play a sound"
 msgstr "Speel _geluiden af"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
+#: ../data/gui/advanced_notifications_window.ui.h:25
+#, fuzzy
+msgid "Receive a Message"
+msgstr "Nieuw Privé Bericht"
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/gui/advanced_notifications_window.ui.h:26
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../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/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 #, fuzzy
 msgid "_Open chat window with user"
 msgstr "Gebruik enkel gespreksvenster met _tabs"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "_Inhoud"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 #, fuzzy
 msgid "for "
 msgstr "Poort: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
 msgstr "Land:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "thema naam"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
 msgid "Last modified:"
 msgstr "Naam:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "_Inhoud"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Geluiden</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Verander Wachtwoord"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Geef opnieuw op ter bevestiging:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Geef nieuw wachtwoord op:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Type your new status message</b>"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Actief"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Ruimte:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 #, fuzzy
 msgid "Preset messages:"
 msgstr "statusbericht"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Sla Bestand op als..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Neem deel aan _Groepsgesprek"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Toevoegen aan Roster"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopieer JID/Email Adres"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopieer Link Lokatie"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Open Email Samensteller"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Open Link in Browser"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Start Gesprek"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "Ver_stuur"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "Onzichtbaar"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "Server"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../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"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "<b>Visuele Meldingen</b>"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "Wijs Open_PGP Sleutel toe"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "commando"
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Wijzig _Groepen"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "_Inhoud"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Verwijder"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 #, fuzzy
 msgid "Send Single _Message..."
 msgstr "Enkel _Bericht Verzenden"
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "_Bestand Verzenden"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Start _Gesprek"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Schakel Open_PGP Codering om"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Schakel Open_PGP Codering om"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Toevoegen aan Roster"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Verbiedt hem/haar mijn status te zien"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "_Inhoud"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Hernoem"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "_Verder"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 #, fuzzy
 msgid "Fill in the form."
 msgstr "In de groep"
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Ruimte Configuratie"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Wijzig Groepen"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Beschrijving</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Server Mogelijkheden"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Bestandsoverdracht annuleren"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Annuleert de geselecteerde bestandsoverdracht"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Ruim _op"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Bestandsoverdrachten"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Verbergt het venster"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Verwijder bestandsoverdracht van de lijst."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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,226 +1207,176 @@ msgstr ""
 "Deze actie verwijdert een enkele bestandsoverdracht van de lijst. Als de "
 "overdracht actief is, wordt hij eerst gestopt en dan verwijdert"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Verder"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Open Bovenliggende Map"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pauze"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "bestandsoverdrachtlijst"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:2
+#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Account\n"
-"Groep\n"
-"Contact\n"
-"Vaandel"
+msgid "Account row"
+msgstr "Account"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Vetgedrukt"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "_Inhoud"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Letterstijl:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajim Themas Aanpassen"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 #, fuzzy
 msgid "Gone"
 msgstr "Geen"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Groep"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 #, fuzzy
 msgid "Inactive"
 msgstr "Actief"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Schuingedrukt"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 #, fuzzy
 msgid ""
 "MUC\n"
 "Messages"
 msgstr "_Bericht"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Gepauzeerd"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Tekst_kleur"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Letter_type"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Achtergrond:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "Verander Bij_naam"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "Verander _Onderwerp"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "Configureer _Ruimte"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Maak _Bladwijzer Voor Deze Ruimte"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Beheer Bladwijzers"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "_Beheerder"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "_Gebruiker Acties"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "_Bestand Verzenden"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Toevoegen aan Roster"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "Uit_schoppen"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Lid"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Eigenaar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "Ver_stuur Privé Bericht"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Stem"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Van"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 #, fuzzy
 msgid "Subject"
 msgstr "Onderwerp:"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-#, fuzzy
-msgid "Delete"
-msgstr "Wis MOTD"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1541,431 +1385,444 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 #, fuzzy
 msgid "_Search Database"
 msgstr "_Zoek"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Contactnaam"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Groupsgesprek"
+
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "_Zoek"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "Maak _Bladwijzer Voor Deze Ruimte"
+msgid "Bro_wse Rooms"
+msgstr "_Bladeren"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/gui/join_groupchat_window.ui.h:4
 #, fuzzy
-msgid "Join this room automatically when I connect"
+msgid "Join this room _automatically when I connect"
 msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Bijnaam:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Recent:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Maak _Bladwijzer Voor Deze Ruimte"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Binnengaan"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Beheer Accounts"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Automatisch binnengaan"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Beheer Bladwijzers"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 #, fuzzy
 msgid "Print status:"
 msgstr "Print tijd:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Ruimte Configuratie"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Verder"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "Wis MOTD"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Eigenschappen</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Instellingen</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr "HTTP Verbinden"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Beheer Proxy Profielen"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Wachtwoord:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Poort:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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 "_Gebruik proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Gebruik aanmelding"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr ""
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+#, fuzzy
+msgid "_Name:"
+msgstr "_Naam: "
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Type:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Gebruikersnaam:"
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Voegt contact toe aan rooster"
-
-#: ../data/glade/message_window.glade.h:2
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Maak _Bladwijzer Voor Deze Ruimte"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Verander Bij_naam"
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "let op deze conversatie"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Klik om een emoticon in te voegen (Alt+E)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Klik om een emoticon in te voegen (Alt+E)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Klik om een emoticon in te voegen (Alt+E)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "Ver_stuur"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Geavanceerde Instellingen Wijzigen</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Toepassingen</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Visuele Meldingen</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Geluiden</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Geluiden</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 #, fuzzy
 msgid "<b>GMail Options</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<b>Eigenschappen</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Vooraf Ingestelde Status Berichten</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Eigenschappen</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Formatteer een gespreksregel</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuele Meldingen</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Geavanceerd"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Alle typen toestanden\n"
-"Alleen bij typen van bericht\n"
-"Uitgeschakeld"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Status: "
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Sta toe informatie over _besturingssysteem te verzenden"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Sta toe informatie over _besturingssysteem te verzenden"
+
+#: ../data/gui/preferences_window.ui.h:28
 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/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Afwezig"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Vraag om status bericht als ik:"
 
-# deelnemen?
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"Herken automatisch als Gajim opstart\n"
-"Gebruik altijd standaard GNOME toepassingen\n"
-"Gebruik altijd standaard KDE toepassingen\n"
-"Aangepast"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "Automatisch _verbinding maken als Gajim opstart"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+msgid "Composing only"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Contactnaam"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Aangepast</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Statusberichten van contacten weergeven in het rooster"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1973,7 +1830,7 @@ msgid ""
 "display in chat windows."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1981,7 +1838,7 @@ msgid ""
 "send to the other party."
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1989,13 +1846,13 @@ msgstr ""
 "Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
 "in beeld"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
@@ -2004,13 +1861,13 @@ msgstr ""
 "Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
 "tijdens het opstarten"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
@@ -2018,13 +1875,13 @@ msgstr ""
 "Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
 "weergeven"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -2033,7 +1890,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -2042,7 +1899,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam in het roostervenster laten zien."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2050,7 +1907,15 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
+"zien"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2058,7 +1923,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2066,14 +1931,14 @@ msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2084,20 +1949,20 @@ msgstr ""
 "lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
 "contacten niet op je rooster geblokkeerd"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2107,13 +1972,13 @@ msgstr ""
 "(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
 "status online, afwezig, bezig, enz...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -2122,110 +1987,135 @@ msgstr ""
 "Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
 "bijpassende grafische emoticons"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Beheer..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Nooit"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Account Wijziging"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Stel mij ervan op de hoogte"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Speel _geluiden af"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Opduiken"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Alleen in _rooster weergeven"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Standaard _status iconenset:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "Vastgelopen"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 #, fuzzy
 msgid "T_heme:"
 msgstr "Thema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2233,7 +2123,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2241,810 +2131,790 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Gebruik _transport iconensets"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Voor bijnaam:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "Automatisch _afwezig na:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Beheer Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 #, fuzzy
 msgid "_File manager:"
 msgstr "Bestandsbeheerder:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Automatisch _niet beschikbaar na:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 #, fuzzy
 msgid "_Open..."
 msgstr "Open..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Herstel naar Standaard Kleuren"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 #, fuzzy
 msgid "_Status message:"
 msgstr "Status bericht:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "Neem deel aan _Groepsgesprek"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "niet in het rooster"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minuten"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 #, fuzzy
 msgid "Privacy Lists:"
 msgstr "Start Gesprek"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 #, fuzzy
 msgid "Active on each startup"
 msgstr "Automatisch _verbinding maken als Gajim opstart"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "_Abonnement"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Weigeren"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 #, fuzzy
 msgid "Order:"
 msgstr "Server:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 #, fuzzy
 msgid "all in the group"
 msgstr "In de groep"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Beide"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Van"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "Geen"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+msgid "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 #, fuzzy
 msgid "to send me messages"
 msgstr "Bericht verzenden"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 #, fuzzy
 msgid "to send me status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
 msgid "to view my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
 msgid "<b>Address</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "Stel Contact_afbeelding in"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Birthday:</b>"
 msgstr "Verjaardag:"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 #, fuzzy
 msgid "<b>Company:</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Geluiden</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Afdeling:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Mail:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Extra Adres:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Familie:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Aangepast</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Homepage:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../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/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Bijnaam:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefoonnummer:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../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/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../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/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Geluiden</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Instellingen</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>Instellingen</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Geluiden</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Info"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr ""
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 #, fuzzy
 msgid "Personal Info"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Werk"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Verwijder account alleen van Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Verwijder account van Gajim en van de server"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Verwijder"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Wis MOTD"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Contact Toevoegen..."
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Server Mogelijkheden"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Bestands_overdrachten"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Veel Gestelde Vragen (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Hulp online"
 
-#: ../data/glade/roster_window.glade.h:8
-#, fuzzy
-msgid "Profile, A_vatar"
-msgstr "Profiel, Contactafbeelding"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Transporten"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "_Rooster Weergeven"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Accounts"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Acties"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Inhoud"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Voorkeuren"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "A_fsluiten"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Enkel _Bericht Verzenden"
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 #, fuzzy
 msgid "_View"
 msgstr "_Stem"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 #, fuzzy
 msgid "Search"
 msgstr "_Zoek"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "_Contact Toevoegen"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "Contact Informatie"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Zoek"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "Ga"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registreer naar"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Annulerem"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Van:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Beantwoord dit bericht"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Verzen_d"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Bericht verzenden"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Aan:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "Be_antwoord"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Ver_stuur & Sluit"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 #, fuzzy
 msgid "Au_thorize"
 msgstr "_Toestemmen"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Geef contact geen toestemming om te zien of je online bent"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Abonneringsverzoek"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Weigeren"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 #, fuzzy
 msgid "Mute Sounds"
 msgstr "Wav Geluiden"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enkel _Bericht Verzenden"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Laat Alle Wachtende Gebeurtenissen Zien"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Groupsgesprek"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Instellingen</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Bron:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Instellingen</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Beschrijving</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Aangepast</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 #, fuzzy
 msgid "Comments"
 msgstr "Commentaar: %s"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Configureer _Ruimte"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "_Inhoud"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Contact Informatie"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Meer"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "Kies een Contactafbeelding"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Geluiden</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Verkeer</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Invoer</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Inschakelen"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Info/Vraag (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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Bericht"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Aanwezigheid"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "Account Be_werken..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr ""
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 #, fuzzy
 msgid "Personal"
 msgstr "Persoonlijke Informatie"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Bron:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+# 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
+msgid "A GTK+ Jabber client"
+msgstr "Een GTK+ Jabber client"
+
+#: ../data/gajim.desktop.in.in.h:2
+msgid "Gajim Instant Messenger"
+msgstr ""
+
+#: ../data/gajim.desktop.in.in.h:3
+msgid "Jabber IM Client"
+msgstr "Jabber IM Client"
+
+#: ../src/adhoc_commands.py:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Contact Informatie"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3072,7 +2942,7 @@ msgstr "In de groep"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr ""
 
@@ -3215,135 +3085,135 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "Onderstreept"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Uit_schoppen"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "Lettertype:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Contact Informatie"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Versleuteling ingeschakeld"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "niet in het rooster"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "Een lijst van actieve, afgeronde en gestopte bestandsoverdrachten"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Gebruik aanmelding"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Gebruik aanmelding"
@@ -3351,58 +3221,58 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, 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:2388
+#: ../src/chat_control.py:2475
 #, 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:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3410,136 +3280,146 @@ msgstr ""
 "Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
 "verlorgen gaan."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "logboek database wordt aangemaakt"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim sluit nu af"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "map %s wordt aangemaakt"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 #, fuzzy
 msgid "Change status information"
 msgstr "Contact Informatie"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 #, fuzzy
 msgid "Change status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 #, fuzzy
 msgid "Free for chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 #, fuzzy
 msgid "Online"
 msgstr "_Verder"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 #, fuzzy
 msgid "Presence description:"
 msgstr "Beschrijving"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Groupsgesprek"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, 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:194
+#: ../src/common/commands.py:201
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "In de groep"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Groupsgesprek"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Gajim - één ongelezen bericht"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3638,9 +3518,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Wis MOTD"
@@ -3898,11 +3778,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:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3910,7 +3790,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:230
+#: ../src/common/config.py:231
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3919,7 +3799,7 @@ msgstr ""
 "Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
 "wanneer een contact zijn/haar status aanpassen."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3928,35 +3808,35 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3964,7 +3844,7 @@ msgid ""
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3976,52 +3856,52 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 #, 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:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 #, 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:251
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4030,326 +3910,352 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../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:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 #, fuzzy
 msgid "I'm available."
 msgstr "Aanwezig"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Open voor Gesprek"
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 #, fuzzy
 msgid "I'm not available."
 msgstr "Niet Beschikbaar"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:490
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4358,107 +4264,98 @@ 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:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:251
-#, fuzzy
-msgid "Wrong host"
-msgstr "Wachtwoord"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Transport %s heeft niet op tijd geantwoord met registratie informatie"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "vCard publicatie is met succes afgerond"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Bijnaam niet gevonden: %s"
@@ -4466,79 +4363,79 @@ msgstr "Bijnaam niet gevonden: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Die ruimte bestaat niet."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Ruimte creatie is beperkt."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Je geregistreerde bijnaam moet gebruikt worden."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Je staat niet in de ledenlijst"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we zijn nu op %s geabonneert"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "afmelding verzocht van %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we zijn nu van %s afgemeld"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4678,28 +4575,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4708,156 +4605,156 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Verbinding"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Onbekende D-Bus versie: %s"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "fout tijdens versturen"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "_Inhoud"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 #, fuzzy
 msgid "Observers"
 msgstr "Server"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transporten"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 #, fuzzy
 msgid "Not in roster"
 msgstr "niet in het rooster"
@@ -4867,38 +4764,52 @@ msgstr "niet in het rooster"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
+#: ../src/common/dbus_support.py:54
+#, 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
+#, 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"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 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:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
+"Try reading %(url)s"
+msgstr "Sessiebus is niet beschikbaar"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
+msgstr "Sessiebus is niet beschikbaar"
 
 #: ../src/common/fuzzyclock.py:38
 msgid "twelve"
@@ -5073,244 +4984,281 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Ongeldig character in gebruikersnaam."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Server adres vereist."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Ongeldig character in hostnaam."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Ongeldig character in bron."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Bezig"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Niet Beschikbaar"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "Open voor _Gesprek"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Open voor Gesprek"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Aanwezig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Aanwezig"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "Af_wezig"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "Onz_ichtbaar"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Onbekend"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Heeft fouten"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Geen"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Aan"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Beide"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Geen"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Abonneren"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Beheerders"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Beheerder"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Deelnemers"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Deelnemer"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Bezoekers"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Bezoeker"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 #, fuzzy
 msgid "Owner"
 msgstr "_Eigenaar"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 #, fuzzy
 msgid "Member"
 msgstr "_Lid"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "let op deze conversatie"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "is met iets anders bezig"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "pauzeert tijdens het typen van een bericht"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "heeft het gespreksvenster of -tab gesloten"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Bericht verzenden"
 msgstr[1] "Bericht verzenden"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "Van %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Ruimte Configuratie"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5320,17 +5268,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Statusbericht"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Grootte: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fout: kan %s niet voor lezen openen"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyaan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "logboek database wordt aangemaakt"
@@ -6029,19 +6034,19 @@ msgstr ""
 msgid "Writing"
 msgstr "Werken"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6049,19 +6054,19 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../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:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6127,297 +6132,293 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "fout tijdens versturen"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr ""
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Statusbericht"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Inschakelen"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Er is geen verbinding beschikbaar"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, 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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "statusbericht"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 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:1830
+#: ../src/config.py:1935
 #, 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:1836
+#: ../src/config.py:1941
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "Beheer Accounts"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, 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:1950
+#: ../src/config.py:2055
 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:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, 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:2215
+#: ../src/config.py:2320
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Versleuteling"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 #, 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:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, 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:2354
+#: ../src/config.py:2460
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 #, fuzzy
 msgid "Member List"
 msgstr "_Lid"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 #, fuzzy
 msgid "Owner List"
 msgstr "_Eigenaar"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrator"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 #, fuzzy
 msgid "Nick"
 msgstr "Uit_schoppen"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 #, fuzzy
 msgid "Role"
 msgstr "Rol:"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 #, fuzzy
 msgid "Banning..."
 msgstr "%s verbannen"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrator"
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6427,63 +6428,91 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Versleuteling uitgeschakeld"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Verbinding"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "<b>Wat wil je doen?</b>"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Verwijder account alleen van Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 #, fuzzy
 msgid "Default"
 msgstr "Wis MOTD"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Print tijd:"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6491,31 +6520,31 @@ msgstr ""
 "bladwijzer."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6525,34 +6554,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:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 #, 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:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6562,7 +6591,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6570,65 +6599,65 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nieuw Bericht"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Contactnaam"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contact is Ingelogd"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 #, fuzzy
 msgid "Message Sent"
 msgstr "_Bericht"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Uitnodiging Ontvangen"
@@ -6649,46 +6678,46 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "A_fsluiten"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr ""
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6696,7 +6725,7 @@ msgstr[0] "Gisteren"
 msgstr[1] "Gisteren"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
@@ -6810,73 +6839,73 @@ msgstr ""
 "Vul de informatie van de contactpersoon in die je aan account %s toe wilt "
 "voegen"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Ongeldige Gebruikers ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 #, fuzzy
 msgid "The user ID must not contain a resource."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Ik zou je graag aan mijn rooster willen toevoegen."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Contact staat al in het rooster"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Deze contact staat al op je rooster"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 #, fuzzy
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6885,43 +6914,43 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Ongeldige account naam"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
@@ -6929,70 +6958,70 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, 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:2221
+#: ../src/dialogs.py:2363
 #, 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:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -7002,176 +7031,174 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nieuw Bericht"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr ""
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Group Chat Contact Role:Geen"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Ontvangen %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Console"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Vastgelopen"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Be_werk"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Verwijder"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7179,163 +7206,164 @@ msgid ""
 msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 #, fuzzy
 msgid "Add"
 msgstr "Adres"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "Be_werk"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+#, fuzzy
+msgid "Delete"
+msgstr "Wis MOTD"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Groep"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Contact Toevoegen"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Beschrijving: %s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formatteer een gespreksregel</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 #, 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:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 #, 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:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr ""
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 #, fuzzy
 msgid "Condition"
 msgstr "Verbinding"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7343,38 +7371,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7384,78 +7412,78 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Overigen"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Conferentie"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 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:554
+#: ../src/disco.py:591
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Service Ontdekking"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "De service kon niet worden gevonden"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7463,97 +7491,102 @@ msgstr ""
 "Er bestaat geen service op het opgegeven adres, of de service geeft geen "
 "antwoord. Controleer het adres en probeer nogmaals."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "De service kan niet worden doorbladerd"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "via account %s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Bladeren"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "commando"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Beschrijving"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Maak _Bladwijzer Voor Deze Ruimte"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Bladwijzer bestaat al"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Ruimte \"%s\" heeft al een bladwijzer."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Bladwijzer is met succes toegevoegd"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonneren"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 #, fuzzy
 msgid "Node"
 msgstr "Geen"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Abonneer"
@@ -7603,7 +7636,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7769,103 +7802,91 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "Server Mogelijkheden"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Bestand"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tijd"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Voortgang"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Bestandsnaam: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Jij"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Afzender: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Opgeslagen in: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Bestandsoverdracht afgerond"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Open Bovenliggende Map"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "Bestandsoverdracht geannuleerd"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Ontvanger: "
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Bestandsoverdracht Gestopt"
@@ -7874,7 +7895,7 @@ msgstr "Bestandsoverdracht Gestopt"
 msgid "Choose File to Send..."
 msgstr "Kies het Bestand om te Sturen"
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Beschrijving: %s"
@@ -7907,34 +7928,34 @@ msgstr "Beschrijving: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Dit bestands bestaat al"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 #, 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -7970,77 +7991,58 @@ msgstr "Bestand: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Afzender: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Verder"
+
+#: ../src/gajim.py:141
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim vereist een Xserver en zal nu stoppen..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim vereist GTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim vereist GTK 2.6 of nieuwer en zal nu stoppen..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
-
-#: ../src/gajim.py:193
-#, fuzzy
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Controleer of gtk en pygtk ondersteuning hebben voor libglade op je systeem."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim vereist PySQLite2"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim vereist PySQLite2"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8048,11 +8050,11 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8096,8 +8098,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "account"
 
@@ -8119,12 +8121,15 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "een van: offline, online, chat, away, xa, dnd, invisible"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "bericht"
 
@@ -8382,79 +8387,95 @@ msgid ""
 msgstr ""
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "inhoud bericht"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "Nieuwe Ruimte _Binnengaan"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "room"
 msgstr "Van"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Ruimte:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "nick"
 msgstr "Uit_schoppen"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "password"
 msgstr "Wachtwoord:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Laat roostervenster zien of verbergt het"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument \"contact_jid\" ontbreekt"
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8463,31 +8484,31 @@ msgstr ""
 "'%s' staat niet op je rooster.\n"
 "Geef een account op om het bericht mee te sturen."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Je hebt geen actieve account"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumenten:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s niet gevonden"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8496,7 +8517,7 @@ msgstr ""
 "Gebruik: %s commando [argumenten]\n"
 "Commando is een van:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8505,7 +8526,7 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8514,7 +8535,11 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Wachtwoord"
@@ -8545,202 +8570,203 @@ msgstr "Je kunt je huidige thema niet verwijderen"
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Sturen van privé bericht mislukt"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Verander Bij_naam"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Verbinding"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s is nu bekend als %s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Aansluiting: "
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "In de groep"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 is nu %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 #, 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "Vraag mij dit niet nogmaals"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Onderwerp Veranderen"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Geef het nieuwe onderwerp op:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Bijnaam Veranderen"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -8761,61 +8787,61 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Rapporteer Fout"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Details"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Wil je het overschrijven?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:881
+#: ../src/gtkgui_helpers.py:924
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8826,166 +8852,166 @@ msgstr ""
 "gebruiker.\n"
 "Geef een andere bijnaam op:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Verbinding"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fout tijdens versturen"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Abonneringsverzoek"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Abonneer"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8995,103 +9021,104 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Bij elk _bericht"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 #, 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Bron: "
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Bestandsoverdracht Verzoek"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9099,15 +9126,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9118,94 +9145,106 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Verbinding"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"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:2064
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Versleuteling uitgeschakeld"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 #, 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Je zult verbonden worden met %s zonder OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
@@ -9214,46 +9253,46 @@ msgstr ""
 msgid "_New Group Chat"
 msgstr "Groupsgesprek"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 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:121
+#: ../src/history_manager.py:114
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "logboek database wordt aangemaakt"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 #, fuzzy
 msgid "Contacts"
 msgstr "_Inhoud"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Datum:"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 #, fuzzy
 msgid "Nickname"
 msgstr "Bijnaam:"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "_Bericht"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9262,27 +9301,27 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
@@ -9321,40 +9360,40 @@ msgstr "Status is nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr ""
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Afbeelding is te groot"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 #, fuzzy
 msgid "Chats"
 msgstr "Gesprek"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 #, fuzzy
 msgid "Group Chats"
 msgstr "Groupsgesprek"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 #, fuzzy
 msgid "Private Chats"
 msgstr "Start Gesprek"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 #, fuzzy
 msgid "Messages"
 msgstr "_Bericht"
@@ -9367,22 +9406,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s is nu %(status)s"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contact is Uitgelogd"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nieuw Enkel Bericht"
@@ -9407,7 +9446,7 @@ msgstr "Nieuw Enkel Bericht"
 msgid "New Message from %(nickname)s"
 msgstr ""
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "_Verder"
@@ -9416,12 +9455,12 @@ msgstr "_Verder"
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "Bestandspad"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "Die ruimte bestaat niet."
@@ -9429,7 +9468,7 @@ msgstr "Die ruimte bestaat niet."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr ""
 
@@ -9463,51 +9502,51 @@ msgstr ""
 "Er trad een fout up bij het publiceren van je persoonlijke informatie, "
 "probeer het later nogmaals."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Je zult verbonden worden met %s zonder OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9516,28 +9555,39 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, 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:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Bestandsoverdracht annuleren"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9546,16 +9596,16 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9564,12 +9614,12 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9578,74 +9628,74 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 #, 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:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 #, fuzzy
 msgid "Rename Contact"
 msgstr "_Inhoud"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, 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:2749
+#: ../src/roster_window.py:2832
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, 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:2791
+#: ../src/roster_window.py:2878
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Verwijder"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Verwijdert contact van rooster"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9655,12 +9705,12 @@ msgstr ""
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>Wat wil je doen?</b>"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9668,17 +9718,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9687,42 +9737,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:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 #, fuzzy
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
@@ -9730,31 +9780,31 @@ msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:3986
+#: ../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."
 msgstr ""
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ongeldig Bestand"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Stuur %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Stuurt een bestand aan contact"
@@ -9764,139 +9814,143 @@ msgstr "Stuurt een bestand aan contact"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Beheer Bladwijzers..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publiceren"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Publiceren"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "Ontdek Services..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Ver_stuur Server Bericht"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 #, fuzzy
 msgid "To all online users"
 msgstr "_Online Gebruikers"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "_Inhoud"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transporten"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transporten"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Hernoem"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contact is Ingelogd"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contact is Ingelogd"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 #, fuzzy
 msgid "History Manager"
 msgstr "_Geschiedenis"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
@@ -9931,9 +9985,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9946,120 +10000,130 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "niet in het rooster"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Bron: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "Verbinding"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contact is Ingelogd"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Type:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Account Wijziging"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Afgerond"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze service heeft nog niet geantwoord met gedetaileerde informatie"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10067,30 +10131,30 @@ msgstr ""
 "Deze service kon niet antwoorde met gedetaileerde informatie.\n"
 "Het is waarschijnlijk veroudert of kapot"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Toepassingen</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10098,7 +10162,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10106,32 +10170,296 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 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:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
 #, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Neem deel aan _Groepsgesprek"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Contact Toevoegen..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "Ontdek Services"
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "Account Be_werken..."
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Persoonlijke Informatie"
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "_Start Gesprek"
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Account Wijziging"
+
+#~ 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 ""
+#~ "Vink dit aan als je wilt dat Gajim verbinding maakt met SSL over poort "
+#~ "5223. Let op, deze functionaliteit werkt mogelijk alleen bij oudere "
+#~ "servers. Gajim gebruikt standaard al TLS waar mogelijk. Deze optie "
+#~ "schakelt TLS echter uit."
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Wijzig Persoonlijke Informatie..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Hostnaam: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Indien aangevinkt zal Gajim wachtwoorden opslaan in ~/.gajim/config met "
+#~ "alleen leesrechten voor allen jou"
+
+#~ msgid "Port: "
+#~ msgstr "Poort: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Sla _wachtwoord op (onveilig)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Keep-alive-pakketten verzenden"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Gebruik _SSL (verouderd)"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Wis MOTD"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "Ver_stuur Server Bericht"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Neem deel aan _Groepsgesprek"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopieer JID/Email Adres"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopieer Link Lokatie"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Open Email Samensteller"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Open Link in Browser"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Start Gesprek"
+
+#, fuzzy
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Account\n"
+#~ "Groep\n"
+#~ "Contact\n"
+#~ "Vaandel"
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "Verander Bij_naam"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "Verander _Onderwerp"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Configureer _Ruimte"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Beheer Bladwijzers"
+
+#~ msgid "Send _File"
+#~ msgstr "_Bestand Verzenden"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Toevoegen aan Roster"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "Ver_stuur Privé Bericht"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Beheer Accounts"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "Wis MOTD"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Voegt contact toe aan rooster"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Maak _Bladwijzer Voor Deze Ruimte"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Verander Bij_naam"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "let op deze conversatie"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Klik om een emoticon in te voegen (Alt+E)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Klik om een emoticon in te voegen (Alt+E)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Klik om een emoticon in te voegen (Alt+E)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Alle typen toestanden\n"
+#~ "Alleen bij typen van bericht\n"
+#~ "Uitgeschakeld"
+
+# deelnemen?
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Herken automatisch als Gajim opstart\n"
+#~ "Gebruik altijd standaard GNOME toepassingen\n"
+#~ "Gebruik altijd standaard KDE toepassingen\n"
+#~ "Aangepast"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Wis MOTD"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "_Contact Toevoegen..."
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "Server Mogelijkheden"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Bestands_overdrachten"
+
+#, fuzzy
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profiel, Contactafbeelding"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Accounts"
+
+#~ msgid "_Contents"
+#~ msgstr "_Inhoud"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Voorkeuren"
+
+#~ msgid "_Quit"
+#~ msgstr "A_fsluiten"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Enkel _Bericht Verzenden"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Enkel _Bericht Verzenden"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Groupsgesprek"
+
+#~ msgid "Enable"
+#~ msgstr "Inschakelen"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "Account Be_werken..."
+
+#, fuzzy
+#~ msgid "Wrong host"
+#~ msgstr "Wachtwoord"
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Controleer of gtk en pygtk ondersteuning hebben voor libglade op je "
+#~ "systeem."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim vereist PySQLite2"
+
+#, fuzzy
 #~ msgid "_Incoming message:"
 #~ msgstr "Binnenkomend bericht:"
 
@@ -10321,10 +10649,6 @@ msgstr " bron met prioriteit"
 #~ msgstr "voor account %s"
 
 #, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Aangepast</b>"
-
-#, fuzzy
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Ongeldige Jabber ID"
 
@@ -10471,9 +10795,6 @@ msgstr " bron met prioriteit"
 #~ msgid "Save _position and size for roster and chat windows"
 #~ msgstr "Sla _positie en grootte op voor rooster- en gespreksvensters"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Alleen in _rooster weergeven"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Het statusbericht voor automatische afwezigheid"
 
@@ -10508,18 +10829,9 @@ msgstr " bron met prioriteit"
 #~ msgid "_Before time:"
 #~ msgstr "Voor tijdsstempel:"
 
-#~ msgid "_Never"
-#~ msgstr "_Nooit"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Stel mij ervan op de hoogte"
-
 #~ msgid "_Player:"
 #~ msgstr "_Speler:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Opduiken"
-
 #~ msgid "Address"
 #~ msgstr "Adres"
 
@@ -10813,9 +11125,6 @@ msgstr " bron met prioriteit"
 #~ msgid "Size: "
 #~ msgstr "Grootte: "
 
-#~ msgid "Session bus is not available"
-#~ msgstr "Sessiebus is niet beschikbaar"
-
 #~ msgid "Sound"
 #~ msgstr "Geluid"
 
diff --git a/po/no.po b/po/no.po
index b0ae93387..e201e5a75 100644
--- a/po/no.po
+++ b/po/no.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.11\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-11-18 15:50+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: <>\n"
@@ -16,59 +16,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Bookmarks: -1,775,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+ Jabber klient"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Bli med i _Gruppe Samtale..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Legg til Kontakt..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Oppdag Tjenester"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Kjør Kommando"
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Rediger Konto"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Åpne Gmail Innboks"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Personlige Hendelser"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Start Samtale..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -78,23 +30,23 @@ msgstr ""
 "\n"
 "Vennligst vent..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Vennligst velg ett av valgene under:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Vennligst fyll in data for din eksisterende konto</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Vennligst velg en server</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -102,57 +54,64 @@ msgstr ""
 "Legg til dette sertifikatet til listen over tiltrodde leverandører.\n"
 "SHA1 fingeravtrykk til sertifikatet:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anon_ym autentisering"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Jeg har allerede en konto jeg ønsker å _bruke"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Behandle..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ingen"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Klargjør profilen min når jeg kobler til"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -160,147 +119,141 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Maskinnavn:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig Informasjon</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "J_ustér etter status"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Konto Endring"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Kontoer"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Administrators oppgaver"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonym autentisering"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Koble til automatisk når kontakten mistes"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Velg denne slik at Gajim vil prøve å koble til port 5223 som gamle servere "
-"forventes å ha SSL muligheter. Merk at Gajim bruker TLS kryptering som "
-"standard dersom dette tilbys av servere, og med dette valget blir TLS "
-"deaktivert."
+"Velg denne slik at Gajim vil spør deg før sending av passordet over en "
+"usikker tilkobling"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Klikk for å forandre kontoens passord"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Klikk for å be om attestering fra alle kontakter av en annen konto"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Ko_ble til når Gajim starter"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Rediger Personlig Informasjon..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "E-Post:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Fornavn:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Generelle"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Maskinnavn:"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -308,8 +261,11 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -317,16 +273,7 @@ msgstr ""
 "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får et "
 "tidsavbrudd som resulterer i frakobling"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet "
-"bare for deg"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -334,8 +281,7 @@ msgstr ""
 "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
 "ved oppstart"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -344,47 +290,49 @@ msgstr ""
 "Dersom valgt vil endringer til global status (håndtert av kombomenyen "
 "nederst i kontaktvinduet) endre status på denne kontoen. "
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Etternavn:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Sammenslåin_g av kontoer"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Ingen"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port:"
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -394,22 +342,20 @@ msgstr ""
 "jabber serveren når to eller flere klienter er tilkoblet med samme konto. "
 "Klienten med den høyeste prioriteten vil få hendelsen"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet vil endres automatisk etter din status."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Gi _nytt navn"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Ressur_s:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -423,199 +369,89 @@ msgstr ""
 "navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
 "hendelsene. (se under)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Lagre _passord setning (usikkert)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Send hold-i-live meldinger"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Send _hold-i-live pakker"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "_Synkroniser kontakter"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Bruk _SSL (gammel)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Bruk filoverførings proxier"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Justér etter status"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Navn:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "J_ustér etter status"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Kontoer"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anonym autentisering"
-
-#: ../data/glade/accounts_window.glade.h:13
-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"
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Ko_ble til når Gajim starter"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Post:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Fornavn:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Dersom valgt vil Gajim få passordet fra en GPG agent slik som seahorse"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Etternavn:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Sammenslåin_g av kontoer"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Gi _nytt navn"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Send _hold-i-live pakker"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Synkroni_ser konto status med global status"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "_Synkroniser kontakter"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Bruk G_PG Agent"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Bruk egen_definert maskinnavn/port"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Bruk egen_definert port:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Bruk filoverførings proxier"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Rediger Personlig Informasjon..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Slå på"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Maskinnavn:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Behandle..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Advar før benyttelse av en usikker tilkobling"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_bruk HTTP_PROXY system variabel"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "legg til"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-lukk"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-fjern"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Konto"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Legg til ny Kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -627,7 +463,7 @@ msgstr ""
 "protokollen. Klikk på registrer knappen for\n"
 "å fortsette."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -635,409 +471,466 @@ msgstr ""
 "Du må være koblet til transporten for å kunne\n"
 "legge til en kontakt fra denne protokollen."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Kallenavn:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokoll:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registrer"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>En feil har skjedd:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Velg kommando som skal kjøres:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc kommandoer - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Sjekk en gang til"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Feil beskrivelse..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Vennligst vent, henter liste over kommandoer..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Vennligst vent, sender kommandoer..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Vennligst vent..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Denne jabber enheten eksponerer ikke noen kommandoer."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivelse</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Slett MFD (MOTD)"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Rediger _Private Lister..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Sender en melding til alle tilkoblede brukere på denne serveren"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Sett MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Oppdater MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Send Server Melding..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Handlinger</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Betingelser</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Lyder</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Avanserte Handlinger"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Instilinger for Hendelsesmeldinger"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Alle statuser"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Borte"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Opptatt "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Kjør en kommando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Ikke tilgjengelig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "En eller flere spesielle statuser..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Pålogget / Ledig for Prat"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Spill av en lyd"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Motta en Melding \n"
-"Kontakt ble Frakoblet \n"
-"Kontakt Endret Status \n"
-"Melding i Samtalerom Utheving \n"
-"Melding i Samtalerom Mottatt \n"
-"Filoverførings Forespørsel \n"
-"Filoverføring Startet \n"
-"Filoverføring Ferdig"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Deaktiver automatisk åpning av samtale vindu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Deaktiver eksisterende oppsprett vindu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Deaktiver eksisterende lyd for denne hendelsen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Deaktiver visning av hendelser i kontaktlisten"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Deaktiver visning av hendelser i systemstatusfeltet"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informer meg med et oppspretts vindu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Åpne samtale vindu med bruker"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Vis hendelse i kontaktliste"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Vis hendelse i systemstatusfeltet"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "og jeg"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kontakt(er)\n"
-"gruppe(r)\n"
-"alle"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "for "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entry:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Feed navn:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Sist endret:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Ny hendelse motatt"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Du har mottatt en ny inntreden:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blokkerte Kontakter"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Melding:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Sett Aktivitet"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Sett en aktivitet"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Melding:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Stemning:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Endre Passord"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Skriv inn en gang til for verifisering:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Skriv inn nytt passord:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Aktivitet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Humør:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Forvalgte meldinger:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Lagre som Forvalg..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Bli med i _Gruppe Samtale"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Legg til Kontaktliste..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopier JID/E-post Adresse"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopier Link PLassering"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Åpne ny Epost"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Åpne Link i Nettleser"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Start Samtale"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Send"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "In_viter"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Inviter Venner!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "MUC server"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Vennligst velg en MUC server."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1045,187 +938,185 @@ msgstr ""
 "Du kommer nå til å starte en Fler-Bruker Samtale.\n"
 "Velg kontaktene du ønsker å invitere"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Legg til Spesielt _Varsel"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Tilegn Open_PGP Nøkkel..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "K_jør Kommando..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Rediger _Grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "In_viter til"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Inviter _Kontakter"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Send Egendefiner_t Status"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Send Enkel _Melding..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Send _Fil..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Velg Egendefinert _Avatar..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Endre Ende til Ende Kryptering"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Endre Open_PGP Kryptering"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Legg til Kontaktliste..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Tillat han/henne å se min status"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Blokker"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Forby han/henne å se min status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historie"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignorer"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Behandle Kontakt"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Gi nytt navn..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Frigi"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Ikke ignorer"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Fyll inn skjemaet."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Rom Instillinger"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESesjon</b> informasjon)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Verifiser"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Funksjonalitet"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Avbryt filoverføring"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Avbryter valgte filoverføring"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Rydd _opp"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Fil Overføringer"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Lukker vinduet"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverføringen fra listen"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1233,75 +1124,74 @@ msgstr ""
 "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil "
 "den først bli stoppet og så fjernet."
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Fortsett"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Åpne Foreldre Katalog"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "fil overførings liste"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Samtalestatus Fane Farger</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Konto rad\n"
-"Gruppe rad\n"
-"Kontakt rad\n"
-"Samtale Banner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Konto"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Fet"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Skriver"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Font stil:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Valg"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Borte"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Gruppe"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1309,7 +1199,7 @@ msgstr ""
 "MUC\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1317,109 +1207,73 @@ msgstr ""
 "MUC Sendte\n"
 "Meldinger"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pauset"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Tekst _farge:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Tekst _font:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Endre _Kallenavn..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Endre _Tittel..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Konfigurer _Rom..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Bokmerke"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Ødelegg Rom"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Behandle Rom"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimer ved lukking"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "M_odererer"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Beboer Handlinger"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Send _Fil"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Legg til Kontaktliste"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Eier"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Send Privat Melding"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Stemme"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Lag en ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Fra"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Tittel"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1429,25 +1283,19 @@ msgstr ""
 "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/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Slett"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Eksport"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim Historske Logg Behandler"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1461,402 +1309,420 @@ msgstr ""
 "Bruk dette programmet til å slette eller eksportere logger. Du kan velge "
 "logger fra venstre og/eller søke databasen under."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Søk Databasen"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Skriv inn JID eller Kontakt navn\n"
-"Gruppesamtale Historikk\n"
-"All Samtale Historikk"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Kontakt navn"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Gruppesamtaler"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Søk:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Bokmerke dette rommet"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Utforsk"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Nylig:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Bokmerke dette rommet"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Behandle Kontoer"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Auto bli med"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimer ved Automatisk Deltakelse"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Skriv status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Tittel:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "PEP Service Konfigurasjon"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Konfigurer"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaper</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Instillinger</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Proxy _Host:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Proxy _Port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Bruk HTTP prox_y"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Bruk proxy aut_entisering"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Navn:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Skriv:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Bokmerke dette rommet (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Søk gjennom samtale historikken (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Endre rommets emne (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Endre ditt _Kallenavn (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Inviter kontakter til samtalen (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Send en fil (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Vis en liste over uttrykksikon (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Vis en liste over formatteringer"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Vis kontaktens profil (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Send"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Passord setning"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editering av Avanserte Instillinger</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Applikasjoner</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Handlinger</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatisk Status</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Samtale Utseende</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Samtale Linje Farger</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Samtale status alarmer</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Betingelser</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Egendefinert</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Font</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail Valg</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Forvalgt Status Melding</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<i>Privatliv</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Status Meldinger</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Temaer</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Mellomnavn:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuelle Alarmer</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Avansert..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Alle samtale statuser \n"
-"Bare komponering \n"
-"Deaktivert"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Alle statuser"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Tillat _OS informasjon å bli sendt"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Tillat lys når jeg er _opptatt"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Borte"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Alltid bruk OS/X standard applikasjoner"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Autodetektér hver gang Gajim starter\n"
-"Alltid bruk GNOME standard applikasjoner\n"
-"Alltid bruk KDE standard applikasjoner\n"
-"Alltid bruk Xfce standard applikasjoner\n"
-"Egendefinert"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "K_oble til når Gajim starter"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Samtale melding:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Sjekk ved oppstart om Gajim er _standard Jabber klient"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Skriver"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Konfigurer farge og font for grensesnittet"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Samtale melding:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontakt navn"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Egendefinert"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
 msgstr ""
-"Frakoblet kontaktliste med frakoblede samtaler\n"
-"Frakoblet kontaktliste med enkelt samtaler\n"
-"Ett vindu til alt\n"
-"Frakoblet kontaktliste med samtaler gruppert etter konto\n"
-"Frakoblet kontaktliste med samtaler gruppert etter type"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Deaktivert"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Vis _aktivitet til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Vis _ekstra e-post detaljer"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Vis h_umør til kontakter i kontaktlisten"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Vis _sanger til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Viser _kontaktikoner for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Vis h_umør til kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Viser status _meldinger for kontakter i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1866,7 +1732,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "vise i samtale vinduer."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1876,7 +1742,7 @@ msgstr ""
 "med en kontakt. Her kan du spesifisere hvilke samtalestatuser du ønsker å "
 "sende motparten."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1884,11 +1750,11 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Gjem alle knapper i samtale vinduer"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1896,20 +1762,20 @@ msgstr ""
 "Dersom valgt vil Gajim tillate at andre detekterer hvilket operativsystem du "
 "bruker"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Desrom valgt vil Gajim også inkludere informasjon om senderen av nye e-post"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Dersom valgt vil Gajim endre status til Borte når maskinen ikke brukes."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1917,7 +1783,7 @@ msgstr ""
 "Dersom valgt vil Gajim endre status til Ikke Tilgjengelig når maskinen ikke "
 "har vert i bruk enda lenger"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1925,7 +1791,7 @@ msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet "
 "og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1933,25 +1799,31 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet og i gruppesamtaler"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise aktivitet for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "Dersom valgt vil Gajim vise humør for kontakter i kontaktliste vinduet"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise sanger som kontakter spiller i kontaktliste "
 "vinduet"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1961,7 +1833,7 @@ msgstr ""
 "Dersom ikke noe språk er valgt med høyreklikking i feltet vil standard "
 "språkvalg brukes for denne kontakten eller gruppesamtale."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1971,7 +1843,7 @@ msgstr ""
 "kontakter. Bruk med varsomhet, fordi det blokkerer alle meldinger fra alle "
 "kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -1981,14 +1853,14 @@ msgstr ""
 "husk at når man bruker E2E kryptering må den andre parten være enig i at "
 "logging er OK, ellers vil ikke beskjeder logges."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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 ""
 "Dersom valgt vil Gajim vise en melding når en ny e-post mottas fra GMail"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -1997,7 +1869,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2005,7 +1877,7 @@ msgstr ""
 "Dersom valgt vil Gajim ikke spør for en status beskjed. Standard valget for "
 "beskjed vil benyttes isteden."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2013,79 +1885,102 @@ msgstr ""
 "Dersom ikke deaktiver, vil Gajim bytte ut ascii smil som ':)' med animerte "
 "eller statiske grafiske uttrykksikoner"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Logg _krypterte samtale sesjoner"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Gj_ør meldings vinduet kompakt"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Be_handle..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Aldri\n"
-"Bare når hendelser venter\n"
-"Alltid"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Aldri"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Kunngjøringer"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Varsle meg om kontakter som logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Varsle meg om kontakter som logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Gi meg beskjed om det"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Alarmér om nye _Gmail e-post"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Aldri\n"
+"Bare når hendelser venter\n"
+"Alltid"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Personlige Hendelser"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
-"Sprett opp\n"
-"Varsle meg om det\n"
-"Vis bare i kontaktlisten"
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Sprett opp"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Vis bare i _kontaktliste"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Vis systemstatus:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2093,27 +1988,27 @@ msgstr ""
 "Noen meldinger kan inkludere rikt innhold (formatering, farger osv). Dersom "
 "valgt vil Gajim kun vise rå meldings tekst."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Standard _ikonsamling:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2125,7 +2020,7 @@ msgstr ""
 "$S byttes ut av tidligere status melding\n"
 "$T byttest ut av automatisk-borte tidsavbrudd"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2137,366 +2032,381 @@ msgstr ""
 "$S vil byttes ut av forrige status melding\n"
 "$T vil byttes ut av automatisk-ikke-tilgjengelig tidsavbrudd"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Bruk _transport ikoner"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Bruk systemets _standardinstillinger"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Når en ny hendelse blir motatt:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Feil melding: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "F_ør kallenavn:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Borte etter:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Vis samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Uttrykksikoner:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Fil behandler:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorér hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorér rik tekst innhold i innkommende meldinger"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "_Ikke tilgjengelig etter:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Åpne..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Tilbakestill til Standard Farger"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Send Samtale status opplysninger:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Status melding:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "_URL utheving:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Vindusoppførsel:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "i _gruppe samtale"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "i _kontaktliste"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutter"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste over Uønskede:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Legg til / Endre regel</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Regelliste</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Liste over Uønskede</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktiv for denne sesjonen"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktiv på hver oppstart"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Alle"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Alle (inkludert abonnement)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Tillate"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Rekkefølge:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Liste over Utestengte"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "alle etter abonnement"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "alle i gruppen"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ingen\n"
-"begge\n"
-"fra\n"
-"til"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Begge"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Fra"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "en"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "to"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "å sende meg meldinger"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "å sende meg forespørsler"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "å sende meg status"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "å se min status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresse</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>By:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Avdeling:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Etternavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Fullt Navn</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Fornavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Hjemmeside:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Mellomnavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Navn:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Kallenavn:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Stilling:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Rolle:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Stat:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Gate:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffiks:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Om"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Klikk for å sette ditt kontaktbilde"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Personlig Info"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Jobb"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Fjern konto fra Gajim og fra _serveren"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2504,192 +2414,143 @@ msgstr ""
 "<b>noen@etsted.no</b> ønsker at du skal <b>legge til</b> noen kontakter i "
 "kontaktlisten din."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../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/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Kontaktliste Element Utveksling"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "Avbryt"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Legg til _Kontakt..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Fun_ksjoner"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Fil _Overføringer"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Ofte Stilte Spørsmål (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Hjelp online"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil, B_ilde"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Vis Bare _Aktive Kontakter"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Vis Trans_porter"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Kontoer"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Innhold"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Instillinger"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Avslutt"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "_Send Enkeltmelding..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Vis"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Vennligst vent, henter søke skjemaet..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Søk"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Legg til kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Informasjon"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Søk"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "G_å"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registrer til:"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Fra:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Svar på denne meldingen"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Send melding"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Send melding og lukk vinduet"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Til:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Go_dkjenn"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2697,175 +2558,190 @@ msgstr ""
 "Avslå godkjenning fra kontakt så han eller henne ikke kan se når du er "
 "tilkoblet"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Abonnerings Forespørsel"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Velg hvilken konto du du ønsker å synkronisere med"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 msgid "Select the contacts you want to synchronise"
 msgstr "Velg kontaktene du ønsker å synkronsiere"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synkroniser : velg kontakter"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Slå av Lyder"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Send _Melding"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Gruppe Samtale"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Spør:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Kontakt tid:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ressurs:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Abbonement:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Konfigurert avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Mer"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Bruker avatar:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Trafikk</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Input</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Slå på"
+#: ../data/gui/xml_console_window.ui.h:4
+msgid "Hide IN stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:5
+msgid "Hide IQ stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Informasjon/Spørring"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Rediger Konto..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lokal jid:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Personlige"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "En GTK+ Jabber klient"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Avbryt bekreftelse"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Tjenesten sendte ødelagte data"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Tjenesten endret sesjons identifikasjon. "
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Tjenesten returnerte en feil."
 
@@ -2890,7 +2766,7 @@ msgstr "Nummer"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Farge"
 
@@ -3027,85 +2903,85 @@ msgstr "Svensk"
 msgid "Chinese (Ch)"
 msgstr "Kinesisk (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Stavekontroll språk"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Understrek"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Streik"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Fjern formattering"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Virkelig send fil?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG kryptering påslått"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Ikke i kontaktliste"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Denne kontakten støtter ikke filoverføring."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Ingen GPG nøkkel tildelt"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3113,50 +2989,50 @@ msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten, så du kan ikke kryptere "
 "meldinger med GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG kryptering avslått"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Sesjonen VIL bli logget"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Sesjonen VIL IKKE bli logget"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "er"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "er IKKE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "vil"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "vil IKKE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "og autentisert"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3165,23 +3041,23 @@ msgstr ""
 "%(type)s kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din samtale sesjon %(logged)s bli logget."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Sesjons forhandlinger avbrutt"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Denne sesjonen er kryptert"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr "og VIL bli logget"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr "og VIL IKKE bli logget"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3189,25 +3065,25 @@ msgstr ""
 "Kontaktens identitet ikke bekreftet. Klikk på skjold knappen for flere "
 "detaljer."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E kryptering avslått"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Den følgende meldingen ble IKKE kryptert"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du fikk akkurat en ny melding fra \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3215,15 +3091,15 @@ msgstr ""
 "Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Database feil"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3232,110 +3108,120 @@ msgstr ""
 "Database filen (%s) kan ikke leses. Prøv å reparer den eller fjern den (all "
 "historikk vil bli tapt)."
 
-#: ../src/chat_control.py:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s er nå %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "lager logg database"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Endre statusinformasjon"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Endre status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Sett fraværstype og beskrivelse"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Ledig for samtale"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Utvidet borte"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Ikke forstyrr"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Frakoblet - ikke kontakt"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Tilstedeværelses beskrivelse:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Statusen har blitt endret."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Gå ut av Gruppesamtale"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s fra %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Du har ikke blitt med i en gruppesamtale."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Gruppesamtaler"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Du gikk ut av følgende gruppesamtaler:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Videresend uleste meldinger"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Alle uleste meldinger har blitt videresendt."
 
@@ -3429,9 +3315,9 @@ msgstr ""
 "Liste (mellomrom separert) av rader (kontoer og grupper) som er kollapset."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "standard"
 
@@ -3719,12 +3605,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:228
+#: ../src/common/config.py:229
 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:229
+#: ../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."
@@ -3732,7 +3618,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:230
+#: ../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."
@@ -3740,7 +3626,7 @@ msgstr ""
 "Dersom False vil du ikke lenger kunne se status linjer i samtaler når en "
 "kontakt endrer hans eller hennes status og/eller status melding. "
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3753,29 +3639,29 @@ msgstr ""
 "hennes status melding. Dersom \"all\" vil Gajim vise alle status meldinger. "
 "Dersom \"in_and_out\" vil Gajim bare vise FOO kommer/drar fra gruppesamtalen."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 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:234
+#: ../src/common/config.py:235
 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:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Ikke vis kontaktbilde for transporten selv."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Ikke vis kontaktlisten i systemstatus-feltet."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3785,7 +3671,7 @@ msgstr ""
 "vindusbehandleren blinke (vanlig oppførsel i de fleste vindusbehandlere) når "
 "det er ventende hendelser."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3796,7 +3682,7 @@ msgstr ""
 "til gruppesamtaler"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3817,31 +3703,31 @@ msgstr ""
 "til forskjellige vinduer. Merk, endring av dette valget krever omstart av "
 "Gajim før det aktiveres"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Gjemmer knappene i samtale vinduer."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Gjemmer tittel banneret i gruppesamtalevinduet"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Gjemmer tittel banneret i to personers samtale vindu"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Gjemmer rommets medlemsliste i gruppesamtale vinduet."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3849,15 +3735,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Innrykk når man bruker sammenslåing av like kallenavn."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Jevn tekstrulling av meldinger i samtale vinduene"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3865,11 +3751,11 @@ msgstr ""
 "Liste av farger, separert av \":\", som vil bli brukt til å farge kallenavn "
 "i gruppesamtaler."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3877,7 +3763,7 @@ msgstr ""
 "Skal vi vise bekreft metakontakt opprettings dialogen eller ikke?Tomt "
 "innhold mener at vi aldri viser dialogen."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3885,7 +3771,7 @@ msgstr ""
 "Skal vi vise bekrefte blokk kontakt dialog eller ikke? Tomt tekststreng "
 "betyr at vi aldri viser dialogen."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3893,7 +3779,7 @@ msgstr ""
 "Skal vi vise bekrefte egendefinert status dialog eller ikke? Tomt "
 "tekststreng betyr at vi aldri viser dialogen."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3903,7 +3789,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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3911,7 +3797,7 @@ msgstr ""
 "Dersom True vil Gajim bruke Gnome Keyring (dersom tilgjengelig) til å lagre "
 "konto passord."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3919,7 +3805,7 @@ msgstr ""
 "Dersom True vil Gajim bruke KDE Wallet (dersom kwalletcli er tilgjengelig) "
 "til å lagre konto passord."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3927,7 +3813,7 @@ msgstr ""
 "Dersom True vil Gajim vise antall tilgjengelige og totalt antall kontakter "
 "og gruppe rader. "
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3935,7 +3821,7 @@ msgstr ""
 "Kan være tom, 'chat' eller 'normal'. Dersom ikke tom, behandle alle "
 "innkommende meldinger som om de var av denne typen."
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3943,7 +3829,7 @@ msgstr ""
 "Dersom True vil Gajim skrolle og velge kontakten som sendte deg siste "
 "melding, om ikke samtalevinduet allerede er åpnet. "
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3951,18 +3837,18 @@ 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:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Tif med inaktivitet som behøves før endre status vinduet lukkes."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 "Maksimalt antall linjer som vises i samtaler. De eldste linjene fjernes."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3970,11 +3856,11 @@ msgstr ""
 "Dersom True vil kunngjøringsvinduer fra notification-deamon bli festet til "
 "systray ikonet."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Velg intervall mellom 2 punkter av ledighet."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -3982,7 +3868,7 @@ msgstr ""
 "Endre verdien for å endre størrelsen på lateks formlene som vises. Høyrere "
 "er større."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -3990,7 +3876,7 @@ 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:272
+#: ../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!"
@@ -3999,13 +3885,13 @@ msgstr ""
 "tilkobling til en konto etableres. ADVARSEL: Dette forårsaker mange "
 "forespørsler!"
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 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:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4013,7 +3899,23 @@ msgstr ""
 "Når skal selv kontakt raden vises. Kan være \"always\",\"when_other_resource"
 "\" eller \"never\""
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4021,7 +3923,7 @@ msgstr ""
 "Prioritet vil endre automatisk i følge med din status. Prioritetene "
 "defineres i autopriority_* valgene."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4030,39 +3932,39 @@ msgstr ""
 "borte, xa, ikke forstyrr, usynlig. MERK: dette valget brukes bare dersom "
 "restore_last_status er deaktivert"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Dersom valgt, gjenopprett siste status brukt."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 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:298
+#: ../src/common/config.py:308
 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:301
+#: ../src/common/config.py:311
 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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktiver ESessions kryptering for denne kontoen."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 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:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4070,29 +3972,36 @@ msgstr ""
 "Ordnet liste (mellomrom separert) av tilkoblingstyper som skal prøves. Kan "
 "inneholde tls, ssl eller plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 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:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Vis en advarsels dialog før sending av passord over en ukryptert tilkobling."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Mellomromseparert liste av ssl feilmeldinger som ignoreres."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Mellomrom sendt etter inaktivitet"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "XMPP ping sendt etter inaktivitet"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4101,11 +4010,11 @@ msgstr ""
 "prøver å koble til på nytt."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 omvei"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4113,15 +4022,15 @@ msgstr ""
 "Dersom valgt vil Gajim bruke din IP og proxier definert i "
 "file_transfer_proxies valget for filoverføring."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Svar på kvitteringsforespørsler"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Sende kvitteringsforespørsler"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4129,11 +4038,16 @@ msgstr ""
 "Når vi forhandler en kryptert sesjon, skal Gajim anta at du ønsker at "
 "meldinger skal logges?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Er OpenPGP tilgjengelig for denne kontakten?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4141,101 +4055,101 @@ msgstr ""
 "Skal Gajim automatisk starte en kryptert sesjon med denne kontakten når "
 "mulig?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Språk som vi ønsker å sjekke feilstavede ord med"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "alle eller mellomroms separert status"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no', eller 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' eller ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Jeg er ute og lever livet."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Jeg er tilgjengelig."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Ledig for prat."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Snart tilbake."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Jeg er ikke tilgjengelig."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Ikke forstyrr."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Hade bra!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4244,58 +4158,50 @@ msgstr ""
 "muc_highlight_words, eller når en samtalerom melding inneholder ditt "
 "kallenavn."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Lyd som spilles når en ny samtalerom melding mottas."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Klarer ikke å uvirksom modulen"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Feil maskinnavn"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Ugyldig lokal adresse? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, 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:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registrering vellykket"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s var vellykket"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Registrering feilet"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4303,39 +4209,39 @@ msgstr ""
 "Registrering med agenten %(agent)s feilet med melding %(error)s: %(error_msg)"
 "s"
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Disk Skrive Feil"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Usynlighet ikke støttet"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s støtter ikke usynlighet."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 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:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4344,7 +4250,7 @@ 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:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Kallenavn ikke lovlig: %s"
@@ -4352,76 +4258,76 @@ msgstr "Kallenavn ikke lovlig: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Maksimum antall brukere for %s er nådd"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du er uønsket fra gruppesamtalen %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppesamtalerom %s finnes ikke."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Gruppesamtale oppretting er begrenset."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerte kallenavn må brukes i gruppesamtale %s. "
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du er ikke i medlemslisten i gruppesamtale %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Rommet har blitt ødelagt"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan bli med i dette rommet isteden: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abonnerer nå på %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abonnerer ikke lenger på %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4559,16 +4465,16 @@ msgstr "Nøkkel bruk inkluderer ikke sertifikats signering"
 msgid "Application verification failure"
 msgstr "Applikasjons verifiserings feil"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 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:259
+#: ../src/common/connection.py:274
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4576,11 +4482,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Denne meldingen er *kryptert* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4589,77 +4495,77 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Automatisk tilkobling."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s tilbyr et annet registrerings skjema"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Ukjent SSL feil: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Ugyldig svar"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarte: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Tilkobling til proxy feilet"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunne ikke koble til kontoen %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, 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:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4668,7 +4574,7 @@ msgstr ""
 "\n"
 "SSL Feil: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4677,24 +4583,24 @@ msgstr ""
 "\n"
 "Ukjent SSL feil: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Feil ved fjerning av liste over uønskede"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4703,43 +4609,43 @@ 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Sendt kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Sendt kontakter:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Ikke hentet på grunn av usynlig status"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Avregistrering feilet"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, 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:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Observerere"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "ikke i kontaktliste"
 
@@ -4748,38 +4654,51 @@ msgstr "ikke i kontaktliste"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus fungerer ikke riktig på denne maskinen"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. Avslutter..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "D-Bus fungerer ikke riktig på denne maskinen"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Databasen kan ikke leses."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Tjeneste ikke tilgjengelig: Gajim kjører ikke, eller remote_control er satt "
 "til False"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr "Sesjons buss ikke tilgjengelig"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Sesjons bussen er ikke tilgjengelig.\n"
 "Prøv å les http://trac.gajim.org/wiki/GajimDBus"
@@ -4947,240 +4866,277 @@ msgstr "Slutten av uken"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Ugyldig karakter i brukernavn."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Server adresse kreves."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Ugyldig karakter i domene navn."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Ugyldig karakter i ressurs."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Opptatt"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Opptatt"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Ikke Tilgjengelig"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Ledig for Samtale"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Ledig for Prat"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Tilgjengelig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Tilgjengelig"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Kobler til"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "B_orte"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Frakoblet"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Usynlig"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?contact has status:Har feilmeldinger"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have:Ingen"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Til"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Begge"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription):Ingen"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Abonnér"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role:Ingen"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Ordstyrere"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Ordstyrer"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Deltakere"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Deltaker"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Besøkende"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Besøk"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Ingen"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Eier"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "er fokusert på en annen samtale"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "gjør noe annet"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "tok pause i skriving av en melding"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "har lukket samtalevinduet eller fanen"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr "fra rom %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr "fra bruker %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr "fra %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, 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:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Rom Instillinger"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+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"
@@ -5190,17 +5146,74 @@ msgstr "Feil i eksekvering av \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s er ikke et gyldig loggnivå"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Standard Melding"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Størrelse: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "turkis"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migrerer logg databaser til indekser"
 
@@ -5837,19 +5850,19 @@ msgstr "Studerer"
 msgid "Writing"
 msgstr "Skriver"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Ukjent Artist"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Ukjent Tittel"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Ukjent Kilde"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5859,12 +5872,12 @@ msgstr ""
 "fra  <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5873,7 +5886,7 @@ msgstr ""
 "avbrutt."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5944,24 +5957,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Feil ved tilføying av tjeneste. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Deaktivert"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Standard Melding"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Påslått"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordliste for språk %s er ikke tilgjengelig"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5970,69 +5979,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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "status melding tekst"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Logge inn på nytt nå?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP kan ikke brukes på denne maskinen"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Uleste hendelser"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Les alle ventende meldinger før du fjerner denne kontoen."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har åpne samtaler på konto %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Konto Navnet er Allerede i Bruk"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6040,143 +6049,143 @@ msgstr ""
 "Dette navnet er allerede i bruk av en annen av dine kontoer. Vennligst velg "
 "et annet navn."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Omdøpe Konto"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Skriv inn nytt navn for konto %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Det er ingen OpenPGP hemmelig nøkkel tilgjengelig."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP Nøkkel Valg"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Din server støtter ikke Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Din server kan ikke lagre din personlige informasjon."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "For å deaktivere kontoen, må du være tilkoblet."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Konto Lokal eksisterer allerede."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Listen over Utestengte"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Medlems Liste"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Eier Liste"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Administrator Liste"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Grunn"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Kallenavn"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Rolle"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Utvis..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6184,11 +6193,11 @@ msgstr ""
 "<b>Hvem ønsker du å utvise?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Legger til Medlem..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6196,11 +6205,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Legger til Eier..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6208,11 +6217,11 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til en eier?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Legger til Administrator..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6220,7 +6229,7 @@ msgstr ""
 "<b>Hvem ønsker du å gjøre til administrator?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6236,85 +6245,113 @@ msgstr ""
 "4. domene (domene selv treffer, samt treffer alle bruker@domene,\n"
 "domene/ressurs, eller adresser som inneholder et underdomene)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Uttryksikoner avslått"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Tilkobling til proxy feilet"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Hva ønsker du å gjøre?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Fjern kontoe _bare fra Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Alle"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Gå inn og legg igjen bare"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Ny Gruppesamtale"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 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:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Ugyldig kallenavn"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Tegn ikke lovlig"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Ugyldig server"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Ugyldig rom"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6324,33 +6361,33 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Vennlist skriv inn serveren du ønsker å registrere."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Sertifikat Allerede i Katalogen"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6365,7 +6402,7 @@ msgstr ""
 "SSL Feil: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6376,59 +6413,59 @@ msgstr ""
 "SHA1 fingeravtrykk til sertifikatet:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Det skjedde en feil under oppretting av kontoen"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Første Melding Motatt"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Neste Melding Motatt i Fokus"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Neste Melding Motatt ikke i Fokus"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt Koblet til"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt Frakoblet"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Melding Sendt"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Gruppe Samtale Melding Utheving"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Gruppe Samtale Melding Motatt"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Gmail E-post Motatt"
 
@@ -6450,44 +6487,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:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Sitat"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Åpne som _Link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6495,7 +6532,7 @@ msgstr[0] "I går"
 msgstr[1] "I går"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
@@ -6602,71 +6639,71 @@ 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Ugyldig Bruker ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Bruker IDen må ikke inneholde en ressurs."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan ikke legge til deg selv i din kontaktliste."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakt allerede i kontaktlisten"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Kontakten er allerede listet  i din kontaktliste."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ Versjon:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK Versjon:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Nåværende Utviklere:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Tidligere Utviklere:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "TUSEN TAKK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6679,101 +6716,101 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord vil ikke bli brukt"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Kallenavnet inneholder ulovlige tegn"
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnerings ønske fra %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du er allerede i gruppesamtale %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Ugyldig Konto"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Ugyldig Kallenavn"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Ugyldig gruppesamtale Jabber ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Gruppesamtalens Jabber ID inneholder ulovlige symboler."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Dette er ikke en samtalegruppe"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s er ikke navnet til en gruppesamtale."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan ikke synkronisere kontakter uten å være tilkoblet."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Denne kontoen er ikke tilkoblet til serveren"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Synkroniser"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6782,173 +6819,171 @@ msgstr ""
 "å sende en samtale melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Ugyldig JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kan ikke analysere \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakt Logget På"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Ny Melding"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Gruppesamtale invitasjon"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakt Endret Status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Enkelt Melding med konto %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Enkelt Melding i konto %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Motatt %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Konsoll"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Lei seg"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Fjern"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6956,153 +6991,153 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Legg til"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Endre"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Slett"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Legg til kontakt"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Fjerner kontakt fra kontaktlisten"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Liste over Uønskede <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Rekkefølge: %(order)s, handling: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Rediger en regel</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Legg til regel</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Liste over Uønskede for %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Liste overUønskede"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Listenavnet er Ugyldig"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 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:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Du er invitert til en gruppesamtale"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har invitert deg til en gruppesamtale"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Ønsker du å akseptere invitasjonen?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Når %s blir:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Legg til Spesiell Alarm for %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Betingelse"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "nå jeg er"
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7113,19 +7148,19 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Du har allerede verifisert denne kontaktens identitet."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet verifisert"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Verifiser igjen..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7135,19 +7170,19 @@ msgstr ""
 "meldinger eller sende meldinger, må du verifisere identiteten ved å klikke "
 "på knappen under. "
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet IKKE verifisert"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Verifiser..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifisert kontaktens identitet?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7162,23 +7197,23 @@ msgstr ""
 "\n"
 "Denne sesjonens Short Authentication String er <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Har du snakket med kontakten og verifisert SASen?"
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ingen GPG nøkkel er tildelt denne kontakten så du kan ikke kryptere "
 "meldinger."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7187,7 +7222,7 @@ msgstr ""
 "nøkkelen<b> så meldingen <b>kan ikke</b> bli kryptert. Bruk din GPG klient "
 "for å stole på denne nøkkelen."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7195,52 +7230,52 @@ msgstr ""
 "GPG nøkkel er tildelt denne kontakten, og du stoler på den, så meldinger vil "
 "bli kryptert."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Andre"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Konferanse"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Se etter Tjenester med %s kontoen"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Tjenesten ble ikke funnet"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7248,93 +7283,97 @@ msgstr ""
 "Det er ingen tjeneste på adressen du oppgav, eller den svarer ikke. Sjekk "
 "adressen og prøv igjen."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Ikke mulig å utforske tjeneste"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Ugyldig Servernavn"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Utforsk %(address)s med kontoen %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Utforsk"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Kjør Kommando"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanner %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Beskrivelse"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Bokmerke"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Bokmerke allerede satt"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppesamtalen \"%s\" er allerede i dine bokmerker."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Bokmerke har blitt lagt til"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Abonnerte"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Node"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Abonnér"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Fjern Abonnement"
 
@@ -7385,7 +7424,7 @@ msgstr "Krever python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Funksjon ikke tilgjengelig i Windows."
 
@@ -7549,103 +7588,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Krever python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Faner og klikkbare linker"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-"Muligheten for å ha klikkbare URLer i samtale og gruppesamtale vindu faner."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Krever python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Krever python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Funksjonalitet"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Fremdrift"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Lagret i: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Åpne Foreldre Katalog"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Fil overføring avbrutt"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottaker:  %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Feil melding: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Fil overføring stoppet"
 
@@ -7653,7 +7679,7 @@ msgstr "Fil overføring stoppet"
 msgid "Choose File to Send..."
 msgstr "Velg Fil for Sending..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Beskrivelse:"
 
@@ -7685,12 +7711,12 @@ msgstr "Beskrivelse: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan ikke overskrive eksisterende fil \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../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."
@@ -7698,22 +7724,22 @@ msgstr ""
 "En fil med dette navnet eksisterer og du har ikke rettigheter til å "
 "overskrive den."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Denne filen finnes fra før"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" er ikke skrivbar"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har ikke rettigheter til å lage filer i denne katalogen."
 
@@ -7749,70 +7775,56 @@ msgstr "Fil: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Fortsett"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim trenger en X server for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importering av PyGTK feilet: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim trenger PyGTK 2.12 eller høyere"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim tenger PyGTK 2.12 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim trenger GTK 2.12 eller høyere"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim trenger GTK 2.12 eller høyere for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ mangler libglade støtte"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
-"versjon fra %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim trenger PySQLite2 for å kjøre"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim trenger pywin32 for å kjøre"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7822,11 +7834,11 @@ msgstr ""
 "på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim kjører allerede"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7869,8 +7881,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "konto"
 
@@ -7892,14 +7904,17 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "en av: frakoblet, tilkoblet, samtale, borte, mer borte, ikke forstyrr, "
 "usynlig"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "melding"
 
@@ -8133,70 +8148,89 @@ msgstr ""
 "til alle kontoer"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Håndtere en xmpp:/ uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI til håndgrep"
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Meldings innhold"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Bli med i et MUC rom"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "rom"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Rom JID"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "kallenavn"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Kallenavn å bruke"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "passord"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Passord for å komme inn i rommet"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Sjekk om Gajim kjører"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Vis eller skjul ipython vindu"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8205,15 +8239,15 @@ msgstr ""
 "'%s' er ikke in kontaktlisten din.\n"
 "Vennligst spesifiser konto for sending av meldingen."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Du har ingen aktiv konto"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Det ser ut som Gajim ikke kjører, så du kan ikke bruke gajim-remote. "
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8222,16 +8256,16 @@ msgstr ""
 "Bruk: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumenter:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s ikke funnet"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8240,7 +8274,7 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8249,7 +8283,7 @@ msgstr ""
 "For mange argumenter. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8258,7 +8292,11 @@ msgstr ""
 "Argumentet \"%(arg)s\" er ikke spesifisert. \n"
 "Skriv \"%(basename)s hjelp %(command)s\" for mer informasjon"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Feil uri"
 
@@ -8287,176 +8325,177 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Skriv inn Kallenavn"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Samtale med"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Fortsettende samtale"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Enhver deltaker får log å se din fulle JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Rom logging er påslått"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Et nytt rom har blitt laget"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "tilhørighet endret"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "rom konfigurasjon er endret til kun-for-medlemmer"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "systemet slår seg av"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har blitt med i gruppesamtalen"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 er nå %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Ikke spør meg igjen"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Endrer Tittel"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Vennlist skriv inn ny tittel:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Endrer Kallenavn"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Ødelegger %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8464,22 +8503,22 @@ msgstr ""
 "Du kommer garantert til å ødelegge dette rommet.\n"
 "Du kan skrive en årsak under:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Du kan også skrive et alternativt møtested:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Utvise %s"
@@ -8500,58 +8539,58 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Rapporter Feil"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim er ikke standard Jabber klient"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Ønsker du å sette Gajim til standard Jabber klient?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Utvidelse ikke støttet"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Lagre Bilde som..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8562,58 +8601,58 @@ msgstr ""
 "en annen samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 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:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Godtar du denne forespørselen på konto %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autentisering for %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Tilkobling Feilet"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "feil ved sending %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Abonnerings forespørsel"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abonnementet fra deg"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8621,59 +8660,59 @@ 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Fjern Abonnement"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, 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:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Rommet viser nå utilgjengelig medlem"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "rommet viser nå ikke utilgjengelige medlemmer"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Rom logging er nå påslått"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Rom logging er nå avslått"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Rommet er nå ikke-anonymisert"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Rommet er nå semi-anonymisert"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Romet er nå full-anonymisert"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
@@ -8681,23 +8720,23 @@ msgstr ""
 "Du har konfigurert Gajim til å bruke GPG agent, men det er ingen GPG agent "
 "som kjører eller den returnerte feil passord frase.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG Passordord er ikke riktig"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG nøkkel ikke tiltrodd"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8705,27 +8744,28 @@ msgstr ""
 "GPG nøkkelen brukt til å kryptere denne samtalen er ikke tiltrodd. Ønsker du "
 "virkelig å kryptere denne meldingen?"
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8740,42 +8780,42 @@ msgstr ""
 "Tittel: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Kontakten stoppet overføring"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Feil under åpning av fil"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8784,36 +8824,36 @@ msgstr ""
 "Ikke mulig å dekryptere melding fra %s\n"
 "Den kan ha blitt endret."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Klarer ikke å dekryptere meldingen"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Brukernavn Konflikt"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Feil."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Ressurs Konflikt"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8821,21 +8861,22 @@ msgstr ""
 "Du er allerede tilkoblet til denne kontoen med det samme ressursnavnet. Prøv "
 "et annet"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Feil ved verifisering av SSL sertifikat"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8846,15 +8887,15 @@ msgstr ""
 "server: %(error)s\n"
 "Ønsker du fortsatt å koble til denne serveren?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignorer denne feilen for dette sertifikatet"
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "SSL sertifikats feil"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8871,23 +8912,28 @@ msgstr ""
 "\n"
 "Ønsker du fortsatt å koble til og oppdatere fingeravtrykket til sertifikatet?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Usikker tilkobling"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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 skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
-"at du ønsker å gjøre det?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jeg ønsker å koble til usikkert"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -8896,21 +8942,30 @@ msgstr ""
 "burde installere PyOpenSSL for å motvirke dette. Er du sikker på at du "
 "ønsker å fortsette?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Du skal til å sende passordet ditt over en usikker kobling. Er du sikker på "
+"at du ønsker å gjøre det?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "PEP noden ble ikke fjernet"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP noden %(node)s ble ikke fjernet: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Uttryksikoner avslått"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8918,7 +8973,7 @@ msgstr ""
 "Ditt konfigurerte følelsesikon tema ble ikke funnet, så følelsesikoner har "
 "blitt slått av. "
 
-#: ../src/gui_interface.py:2570
+#: ../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 "
@@ -8928,40 +8983,40 @@ msgstr ""
 "oppdatere formatet på emoticons.py filen. Se http://trac.gajim.org/wiki/"
 "Emoticons for flere detaljer."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine innstillinger og valg"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Skriv GPG passordsetning for nøkkel %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG nøkkel utgått"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG nøkkel er utgått, du vil bli koblet til %s uten OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Feil Passordsetning"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 
@@ -8969,43 +9024,43 @@ msgstr "Vennligst skriv inn GPG passordsetningen igjen eller trykk Avbryt."
 msgid "_New Group Chat"
 msgstr "_Ny Gruppe Samtale"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Kan ikke finne historisk logg database"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Dato"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Kallenavn"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Melding"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9019,26 +9074,26 @@ msgstr ""
 "\n"
 "I tilfelle du klikker JA, vennligst vent..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Eksporterer Historiske Logger..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Denne operasjonen kan ikke angres."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9077,35 +9132,35 @@ msgstr "Status er nå: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Tidsavbrudd ved lasting av bilde"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Du kommer til å lukke flere tabber"
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Ønsker du virkelig å lukke alle?"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Samtaler"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Gruppe Samtaler"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Private Samtaler"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Meldinger"
 
@@ -9117,22 +9172,22 @@ msgstr "- meldinger vil bli logget"
 msgid "- messages will not be logged"
 msgstr "- -meldinger vil ikke bli logget"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s Endret Status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s Logget På"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s Logget Av"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Ny Enkeltmelding fra %(nickname)s"
@@ -9157,7 +9212,7 @@ msgstr "Melding fra %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Ny Melding fra %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorer"
 
@@ -9165,18 +9220,18 @@ msgstr "Ignorer"
 msgid "Retrieving profile..."
 msgstr "Henter profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Filen er tom"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Filen finnes ikke"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Kunne ikke laste bilde"
 
@@ -9208,53 +9263,53 @@ msgstr ""
 "Det skjedde en feil med publisering av din personlige informasjon, prøv "
 "igjen senere."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Abonnerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG fungerer ikke"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilkoblet til %s uten OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9262,27 +9317,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "ute av synk"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Virkelig avslutte Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Er du sikker på at du vil avslutte Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Alltid lukk Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Avbryt filoverføring"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9290,16 +9356,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:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Du må lese dem før du fjerner denne transporten."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9307,11 +9373,11 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter som bruker "
 "denne transporten."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transportene vil bli fjernet"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9320,12 +9386,12 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra disse "
 "transportene: %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 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:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9334,57 +9400,57 @@ msgstr ""
 "sender deg."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Omdøpe Kontakt"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Skriv inn et nytt kallenavn for kontakt %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Omdøpe Gruppe"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Skriv inn nytt navn for gruppe %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Fjern Gruppe"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9393,11 +9459,11 @@ msgstr ""
 "eller henne alltid vil se deg som frakoblet."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Ønsker du å fortsette?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9405,16 +9471,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontaktene vil bli fjernet fra din kontaktliste"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9424,35 +9490,36 @@ msgstr ""
 "fjerner du også autorisasjonen som gjør at de alltid vil se deg som "
 "frakoblet."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 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:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter lagring støttes ikke av din server"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9460,13 +9527,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:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9476,23 +9543,23 @@ msgstr ""
 "brukes dette når samme person har flere Jabber kontoer eller transport "
 "kontoer."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Ugyldig fil URI:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Send %s til %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gjør %s og %s metakontakter"
@@ -9502,126 +9569,130 @@ msgstr "Gjør %s og %s metakontakter"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Behandle Bokmerker..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "for konto %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Publiser Sang"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Publiser Sang"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Konfigurer Tjenester..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maksimer Alle"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Send Gruppe M_elding"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Til alle brukere"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Til alle påloggede brukere"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Behandle Kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Send en Melding"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Kjør Kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Behandle Transporter"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Endre Transporter"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maksimer"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Koble til på nytt"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Koble ifra"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Historikk Behandler"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Bli med i Gruppesamtale"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -9652,13 +9723,13 @@ msgid "Confirm these session options"
 msgstr "Bekreft disse sesjons valgene"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "The andre klienten ønsker å forhandle en sesjon med disse funksjonene:\n"
 "\n"
@@ -9681,116 +9752,126 @@ msgstr ""
 "\n"
 "Fortsett med sesjonen?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "i _kontaktliste"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [blokkert]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimert]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Siste status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " siden %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Tilkoblet"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Frakoblet"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Sang:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Varslinger"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9798,28 +9879,28 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Time:Ukjent"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "siden %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tilhørighet:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9827,7 +9908,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9835,13 +9916,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9849,18 +9930,375 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Det er ingen ventende abonnements forespørsler."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Bli med i _Gruppe Samtale..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Legg til Kontakt..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Oppdag Tjenester"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Kjør Kommando"
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Rediger Konto"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Personlige Hendelser"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Start Samtale..."
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Konto Endring"
+
+#~ 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 ""
+#~ "Velg denne slik at Gajim vil prøve å koble til port 5223 som gamle "
+#~ "servere forventes å ha SSL muligheter. Merk at Gajim bruker TLS "
+#~ "kryptering som standard dersom dette tilbys av servere, og med dette "
+#~ "valget blir TLS deaktivert."
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Rediger Personlig Informasjon..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Maskinnavn:"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' "
+#~ "rettighet bare for deg"
+
+#~ msgid "Port: "
+#~ msgstr "Port:"
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Lagre _passord setning (usikkert)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Send hold-i-live meldinger"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Bruk _SSL (gammel)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Justér etter status"
+
+#~ msgid "gtk-add"
+#~ msgstr "legg til"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-lukk"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-fjern"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Slett MFD (MOTD)"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Send Server Melding..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Motta en Melding \n"
+#~ "Kontakt ble Frakoblet \n"
+#~ "Kontakt Endret Status \n"
+#~ "Melding i Samtalerom Utheving \n"
+#~ "Melding i Samtalerom Mottatt \n"
+#~ "Filoverførings Forespørsel \n"
+#~ "Filoverføring Startet \n"
+#~ "Filoverføring Ferdig"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontakt(er)\n"
+#~ "gruppe(r)\n"
+#~ "alle"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Bli med i _Gruppe Samtale"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopier JID/E-post Adresse"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopier Link PLassering"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Åpne ny Epost"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Åpne Link i Nettleser"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Start Samtale"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Konto rad\n"
+#~ "Gruppe rad\n"
+#~ "Kontakt rad\n"
+#~ "Samtale Banner"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Endre _Kallenavn..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Endre _Tittel..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Konfigurer _Rom..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Ødelegg Rom"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Behandle Rom"
+
+#~ msgid "Send _File"
+#~ msgstr "Send _Fil"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Legg til Kontaktliste"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Send Privat Melding"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Skriv inn JID eller Kontakt navn\n"
+#~ "Gruppesamtale Historikk\n"
+#~ "All Samtale Historikk"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Behandle Kontoer"
+
+#~ msgid "gtk-delete"
+#~ msgstr "delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Legg til kontakt til kontaktlisten (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Bokmerke dette rommet (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Søk gjennom samtale historikken (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Endre rommets emne (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Endre ditt _Kallenavn (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Inviter kontakter til samtalen (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Send en fil (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Vis en liste over uttrykksikon (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Vis en liste over formatteringer"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Vis en meny med avanserte funksjoner (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Vis kontaktens profil (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Alle samtale statuser \n"
+#~ "Bare komponering \n"
+#~ "Deaktivert"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Autodetektér hver gang Gajim starter\n"
+#~ "Alltid bruk GNOME standard applikasjoner\n"
+#~ "Alltid bruk KDE standard applikasjoner\n"
+#~ "Alltid bruk Xfce standard applikasjoner\n"
+#~ "Egendefinert"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Frakoblet kontaktliste med frakoblede samtaler\n"
+#~ "Frakoblet kontaktliste med enkelt samtaler\n"
+#~ "Ett vindu til alt\n"
+#~ "Frakoblet kontaktliste med samtaler gruppert etter konto\n"
+#~ "Frakoblet kontaktliste med samtaler gruppert etter type"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Sprett opp\n"
+#~ "Varsle meg om det\n"
+#~ "Vis bare i kontaktlisten"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ingen\n"
+#~ "begge\n"
+#~ "fra\n"
+#~ "til"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Legg til _Kontakt..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Fun_ksjoner"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Fil _Overføringer"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil, B_ilde"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Kontoer"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innhold"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Instillinger"
+
+#~ msgid "_Quit"
+#~ msgstr "_Avslutt"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Send Enkeltmelding..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Send _Melding"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Gruppe Samtale"
+
+#~ msgid "Enable"
+#~ msgstr "Slå på"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Rediger Konto..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Feil maskinnavn"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Ugyldig lokal adresse? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr ""
+#~ "pysqlite2 (også kjent som python-pysqlite2) avhengighet mangler. "
+#~ "Avslutter..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Faner og klikkbare linker"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Muligheten for å ha klikkbare URLer i samtale og gruppesamtale vindu "
+#~ "faner."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Krever python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ mangler libglade støtte"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Vennligst fjern din gjeldende GTK+ installasjon og installer siste "
+#~ "stabile versjon fra %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Vennligst sjekk at GTK+ og PyGTK har libglade støtte på ditt system."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim trenger PySQLite2 for å kjøre"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Innkommende melding:"
 
@@ -10081,12 +10519,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim konto %s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Alltid bruk OS/X standard applikasjoner"
-
-#~ msgid "Custom"
-#~ msgstr "Egendefinert"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Duplikat Jabber ID"
 
@@ -10190,9 +10622,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo og Julie</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Gamle historier"
-
 #~ msgid "Soliloquy"
 #~ msgstr "Enetale"
 
@@ -10308,9 +10737,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "Sett status til å vise navnet på _musikk som spilles"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Vis bare i _kontaktliste"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Den automatiserte borte meldinen"
 
@@ -10344,18 +10770,9 @@ msgstr " ressurs med prioritet"
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Avanserte Innstillinger for Hendelsesmeldinger..."
 
-#~ msgid "_Never"
-#~ msgstr "_Aldri"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Gi meg beskjed om det"
-
 #~ msgid "_Player:"
 #~ msgstr "_Spiller:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Sprett opp"
-
 #~ msgid "Address"
 #~ msgstr "Adresse"
 
@@ -10655,9 +11072,6 @@ msgstr " ressurs med prioritet"
 #~ msgid "Size: "
 #~ msgstr "Størrelse: "
 
-#~ msgid "Session bus is not available"
-#~ msgstr "Sesjons buss ikke tilgjengelig"
-
 #~ msgid "Sound"
 #~ msgstr "Lyd"
 
diff --git a/po/pl.po b/po/pl.po
index 0ea3fd838..fa13a5ab4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,70 +9,24 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2010-01-01 20:42+0100\n"
 "Last-Translator: Dominik Kozaczko <dominik@kozaczko.info>\n"
-"Language-Team: Polish <dominik@kozaczko.info, translation-team-pl@lists.sourceforge.net>\n"
+"Language-Team: Polish <dominik@kozaczko.info, translation-team-pl@lists."
+"sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Klient Jabbera w GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Dołącz do _pokoju"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Dodaj kontakt..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Wyszukuj usługi"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Wykonaj komendę"
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Modyfikuj konto"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Otwórz skrzynkę Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Zdarzenia"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Rozpocznij rozmowę"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -82,23 +36,23 @@ msgstr ""
 "\n"
 "proszę czekać..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Wybierz jedną z poniższych opcji:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Uzupełnij proszę dane swojego konta</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Wybierz serwer</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -106,57 +60,64 @@ msgstr ""
 "Dodaj ten certyfikat do listy zaufanych.\n"
 "Odcisk klucza SHA1 tego certyfikatu:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anonimowa autentykacja"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Połącz po wciśnięciu przycisku Zakończ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kreator Konta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "_Mam już konto i chcę z niego korzystać"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Chcę za_rejestrować nowe konto Jabbera"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Włączenie tej opcji spowoduje zapamiętanie hasła dla tego konta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Zarządzaj..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Żaden"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Zapisz _hasło"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Ustaw profil po połączeniu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Użyj własnej nazwy hosta/portu"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -164,431 +125,341 @@ msgstr ""
 "Musisz posiadać konto aby połączyć się\n"
 " z siecią Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Zaawansowane"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Zakończ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Nazwa hosta: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Serwer:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Różne</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informacje o sobie</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "D_ostosuj do statusu"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Modyfikacja konta"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Konta"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Operacje administracyjne"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Używaj autoryzacji serwera proxy"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatyczne połącz po zerwaniu połączenia"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "P_ołącz przy starcie programu"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Z_mień hasło"
 
-#: ../data/glade/account_modification_window.glade.h:10
-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 "Zaznaczenie tej opcji spowoduje łączenia na porcie 5223 gdzie większość serwerów udostępnia usługę SSL. Gajim używa szyfrowania TLS domyślnie, jeśli tylko serwer daje taką możliwość. Ta opcja wyłącza TLS"
+#: ../data/gui/accounts_window.ui.h:13
+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."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Wybierz _klucz..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Kliknij, aby zmienić hasło dla konta"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
-msgstr "Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta"
+msgstr ""
+"Kliknij aby poprosić o autoryzację od wszystkich kontaktów z innego konta"
+
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "P_ołącz przy starcie programu"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Połączenie"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Zmień informacje o sobie..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Adres e-mail:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Imię:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5
-#: ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112
-#: ../src/notify.py:560
-#: ../src/notify.py:581
-#: ../src/notify.py:620
-#: ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52
-#: ../src/common/contacts.py:135
-#: ../src/dialogs.py:111
-#: ../src/dialogs.py:121
-#: ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Ogólne"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Nazwa hosta: "
+#: ../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 ""
+"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/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
-msgid "If checked, Gajim will also broadcast some more IPs except from just your IP, so file transfer has higher chances of working."
-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:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje pobieranie hasła z agenta GPG, np. Seahorse"
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
-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:26
+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/glade/account_modification_window.glade.h:22
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Zaznaczanie tej opcji spowoduje przechowywanie hasła w pliku ~/.gajim/config z prawem do odczytu tylko dla ciebie"
+#: ../data/gui/accounts_window.ui.h:27
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Zaznaczanie tej opcji spowoduje automatyczne łączenie z siecią Jabber z "
+"wykorzystaniem tego konta"
 
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Zaznaczanie tej opcji spowoduje automatyczne łączenie z siecią Jabber z wykorzystaniem tego konta"
+#: ../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 ""
+"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/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-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:29
+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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Informacje o Tobie, takie jakie są przechowywane na serwerze"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35
-#: ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Nazwisko:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Połącz konta"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3
-#: ../src/config.py:1158
-#: ../src/config.py:1261
-#: ../src/config.py:1550
-#: ../src/config.py:1555
-#: ../src/config.py:2103
-#: ../src/config.py:2182
-#: ../src/config.py:2195
-#: ../src/config.py:3396
-#: ../src/config.py:3469
-#: ../src/dialogs.py:308
-#: ../src/dialogs.py:310
-#: ../src/dialogs.py:513
-#: ../src/dialogs.py:526
-#: ../src/roster_window.py:2800
-#: ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Żaden"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Informacje osobiste"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priory_tet:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
-msgid "Priority is used in Jabber to determine who gets the events from the jabber server when two or more clients are connected using the same account; The 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: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 ""
+"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/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Priorytet ulegnie zmianie automatycznie, stosownie do twojego statusu."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Serwer Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "_Zmień nazwę"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Za_sób: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the 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/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Zapisz _hasło (nie jest to bezpieczne)"
+#: ../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 ""
+"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/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Zapisz _logi rozmów dla wszystkich kontaktów"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Wysyłaj pakiety podtrzymujące"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Wysyłaj pakiety _podtrzymujące"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizuj status konta z globalnym statusem"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Synchronizuj kontakty"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Korzystaj z _SSL"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Używaj serwerów proxy do przesyłania plików"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Dostosuj do statusu"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Nazwa: "
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "D_ostosuj do statusu"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Konta"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Używaj autoryzacji serwera proxy"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid "Check this so Gajim will ask you before sending your password over an insecure connection."
-msgstr "Po uaktywnieniu tej opcji Gajim zapyta przed wysłaniem hasła przez nieszyfrowane połączenie."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "P_ołącz przy starcie programu"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Adres e-mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Imię:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Zaznaczenie tej opcji spowoduje pobieranie hasła z agenta GPG, np. Seahorse"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4
-#: ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Nazwisko:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Połącz konta"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42
-#: ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "_Zmień nazwę"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Wysyłaj pakiety _podtrzymujące"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Synch_ronizuj status konta z globalnym statusem"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Synchronizuj kontakty"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Użyj Agenta G_PG"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Użyj wła_snej nazwy hosta/portu"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Użyj inn_ego portu:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Używaj serwerów proxy do przesyłania plików"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Zmień informacje o sobie..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Włącz"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Nazwa hosta: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "Zarządzaj..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Ostrzegaj przed użyciem niezaszyfrowanego połączenia"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_używaj zmiennej środowiskowej HTTP__PROXY"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Konto:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Dodaj nowy kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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 "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../data/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -599,7 +470,7 @@ msgstr ""
 "aby móc dodać kontakt posługujący się tym\n"
 "protokołem."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -608,409 +479,464 @@ msgstr ""
 "aby dodać kontakt posługujący się\n"
 "tym protokołem."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Grupa:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Pseudonim:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "P_rotokół:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "Za_rejestruj"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Wystąpił błąd:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Wybierz komendę do wykonania:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Komendy ad-hoc - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Sprawdź ponownie"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Opis błędu..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Proszę czekać, trwa pobieranie listy komend..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Proszę czekać, trwa wysyłanie komendy..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Proszę czekać..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Ten obiekt Jabbera nie udostępnia żadnych komend."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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"
+msgstr ""
+"<b>UWAGA:</b> powienieneś ponownie uruchomić program by zastosować ostatnie "
+"ustawienia"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Edytor zaawansowanych ustawień"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Usuń MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Usuwa Wiadomość Dnia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "_Edytuj listy prywatności"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 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/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Ustaw MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Ustawia Wiadomość Dnia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Konsola _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Uaktualnij MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Uaktualnia Wiadomość Dnia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Wyślij wiadomość do serwera..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr "z tym kontaktem "
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Akcje</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Warunki</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../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/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Opcje zaawansowane"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Edytor ustawień zaawansowanych"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Dowolny status"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101
-#: ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Zaraz wracam"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Zajęty "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Wykonaj komendę"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Nieobecny"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../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/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Dostępny / Chętny do rozmowy"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Odtwórz dźwięk"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"otrzymam wiadomość\n"
-"kontakt się rozłączy \n"
-"kontakt zmieni status \n"
-"na czacie pojawi się słowo kluczowe \n"
-"otrzymam wiadomość na czacie \n"
-"pojawi się żądanie przesłania pliku \n"
-"rozpocznie się transfer pliku \n"
-"zakończy się transfer pliku"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
-msgid "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "Wyłącz _automatyczne otwieranie okna czatu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Wyłącz wyskakujące okienka"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../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/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "Wyłącz _pokazywanie zdarzenia na liście kontaktów"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "Wyłącz pokazywanie _zdarzenia w obszarze powiadamiania"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Powiadom mnie wyskakującym okienkiem"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Otwórz okno rozmowy z kontaktem"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Pokaż zdarzenie na liście kontaktów"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "Pokaż _zdarzenie w obszarze powiadamiania"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "podczas, gdy "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kontaktu(-ów)\n"
-"grupy(grup)\n"
-"wszystkich"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "dla "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../data/gui/advanced_notifications_window.ui.h:41
+#, fuzzy
+msgid "group(s)"
+msgstr "Grupy"
+
+#: ../data/gui/advanced_notifications_window.ui.h:42
 msgid "when I'm in"
 msgstr "kiedy jestem obecny"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Wpis:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Nazwa kanału:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Ostatnio zmodyfikowany:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Odebrano nowy wpis"
 
-#: ../data/glade/atom_entry_window.glade.h:5
-#: ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Otrzymałeś nowy artykuł:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Zablokowane kontakty"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Wiadomość:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Ustaw Aktywność"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Ustaw Aktywność"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Wiadomość:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Nastrój</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Wpisz ponownie nowe hasło:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Wpisz nowe hasło:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Wpisz nowy opis statusu:</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
-#: ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Aktywność:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
-#: ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Nastrój:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Szablony opisów:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Zapisz jako szablon..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Dołącz do _pokoju"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "Nr"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "Dod_aj do listy kontaktów..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopiuj JID/Adres e-mail"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiuj adres odnośnika"
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Otwórz Klienta Poczty"
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otwórz Link w przeglądarce"
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Rozpocznij rozmowę"
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Wyślij"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "_Zaproś"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Zaproś przyjaciół!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "Serwer MUC"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Proszę wybrać serwer MUC."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1018,271 +944,260 @@ msgstr ""
 "Zamierzasz rozpocząć czat.\n"
 "Wybierz kontakty, które chcesz do niego zaprosić"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Dodaj powiadomienia _specjalne..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Przypisz klucz Open_PGP..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "Wykonaj komendę..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Modyfikuj _grupy..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "Za_proś do"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Zaproś kontakty"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "Us_uń"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9
-#: ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Wyślij odrębny status"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Wyślij _wiadomość..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Wyślij _plik..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Ustaw własny _avatar..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Rozpocznij _rozmowę"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Włącz/wyłącz _szyfrowanie połączenia"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Włącz/wyłącz szyfrowanie Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "Dod_aj do listy kontaktów..."
+
+#: ../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"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7
-#: ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370
-#: ../src/roster_window.py:5501
+#: ../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 "_Zablokuj"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabroń mu/jej widzieć twój status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21
-#: ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historia"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "Ignoruj"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Modyfikuj dane kontaktu"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Zmień nazwę..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Autoryzacja"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13
-#: ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364
-#: ../src/roster_window.py:5498
+#: ../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 "_Cofnij blokadę"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Cofnij ignorowanie"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Wypełnij formularz."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Konfiguracja pokoju"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Edytuj Grupy"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Opis</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Weryfikuj"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Możliwości programu"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Usuwa transfer pliku"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Usuwa wybrany transfer pliku"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Wyczy_ść"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Przesyłane pliki"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Ukrywa okno"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Usuń przesyłanie tego pliku z listy."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.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 "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:11
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+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/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13
-#: ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Kontynuuj"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca"
 
-#: ../data/glade/filetransfers.glade.h:15
-#: ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Otwórz katalog zawierający ten plik"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Zatrzymaj"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "lista przesyłanych plików"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Kolory kart w oknie czatu</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Konto\n"
-"Grupa\n"
-"Kontakt\n"
-"Banner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Konto"
 
-#: ../data/glade/gajim_themes_window.glade.h:6
-#: ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Wytłuszczone"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../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"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Styl czcionki:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Wybieranie motywów dla Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Zniknął"
 
-#: ../data/glade/gajim_themes_window.glade.h:11
-#: ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Grupa"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Nieaktywny"
 
-#: ../data/glade/gajim_themes_window.glade.h:12
-#: ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Kursywa"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1290,7 +1205,7 @@ msgstr ""
 "MUC\n"
 "Wiadomości"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1298,1466 +1213,1549 @@ msgstr ""
 "Czat\n"
 "Wiadomości"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Zatrzymany"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Kolor tekstu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Czcionka tekstu:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Tło:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Zmień pseudo_nim..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Zmień _temat..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Konfiguruj _pokój..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4
-#: ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "Dodaj _zakładkę dla tego pokoju"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Zlikwiduj pokój"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "Zarządzaj pokojem"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimalizuj przy zamknięciu"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Działania użytk_ownika"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Wyślij _plik"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "Dod_aj do listy kontaktów"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Administrator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "Za_banuj"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "Wy_rzuć"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Uczestnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Właściciel"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Wyślij prywatną wiadomość"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Głos"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Utwórz nowy wpis"
 
-#: ../data/glade/groups_post_window.glade.h:2
-#: ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Od"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3
-#: ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Temat"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 msgid ""
 "<b>WARNING:</b>\n"
-"If you plan to do massive deletions, please make sure Gajim is not running. Generally avoid deletions with contacts you currently chat with."
+"If you plan to do massive deletions, please make sure Gajim is not running. "
+"Generally avoid deletions with contacts you currently chat with."
 msgstr ""
 "<b>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."
+"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/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Witaj w menedżerze historii rozmów Gajima</b></big>"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/glade/history_manager.glade.h:4
-#: ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Usuń"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Eksport"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Historia rozmów"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
+"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 ""
-"Menedżer logów nie powinien być używany do przeglądania logów. Jeżeli szukasz tej funkcjonalności, użyj okna historii rozmów.\n"
+"Menedżer logów nie powinien być używany do przeglądania logów. Jeżeli "
+"szukasz tej funkcjonalności, użyj okna historii rozmów.\n"
 "\n"
-"Programu tego używać należy do usuwania lub eksportowania logów. Możesz wskazać logi po lewej stronie okna lub przeszukać ich bazę używając poniższego pola."
+"Programu tego używać należy do usuwania lub eksportowania logów. Możesz "
+"wskazać logi po lewej stronie okna lub przeszukać ich bazę używając "
+"poniższego pola."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Szukaj w bazie"
 
-#: ../data/glade/history_window.glade.h:1
-#: ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Wpisz JID lub nazwe kontaktu\n"
-"Historia rozmów grupowych\n"
-"Wszystkie historie rozmów"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Nazwa kontaktu"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Pokoje"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Szukaj"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Zapisuj historię rozmowy"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Dodaj pokój do zakładek"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "Prze_glądaj"
 
-#: ../data/glade/join_groupchat_window.glade.h:3
-#: ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:4
+#, fuzzy
+msgid "Join this room _automatically when I connect"
 msgstr "Automatycznie dołącz do tego pokoju po uzyskaniu połączenia"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Ostatnio:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9
-#: ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Serwer:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Dodaj pokój do zakładek"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Zarządzaj kontami"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Połącz automatycznie"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Zarządzaj zakładkami"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimalizuj po automatycznym wejściu"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Wyświetlaj status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
-#: ../src/config.py:1663
-msgid "Server:"
-msgstr "Serwer:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Konfiguracja usługi PEP"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Konfiguruj"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Właściwości</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Ustawienia</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Zarządzaj Profilami Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Hasło:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "_Serwer Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "_Port Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Korzystaj z pośrednik_a HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Używaj aut_oryzacji serwera proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Nazwa: "
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Nazwa użytkownika:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Dodaje kontakt do listy kontaktów (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Dodaj pokój do zakładek (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Historia wiadomości (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Zmień temat pokoju (Ctrl+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Zmień swoją nazwę (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Zaproś kontakt do rozmowy (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Wyślij plik (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Kliknij by wyświetlić listę emotikon (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Pokaż formatowanie tekstu"
-
-#: ../data/glade/message_window.glade.h:10
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Pokaż menu zaawansowanych funkcji (Alt+D)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Pokaż profil kontaktu (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr "Przełącz sesję audio"
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Wyślij"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Hasło"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Edytor zaawansowanych konfiguracji</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikacje</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Akcje</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatyczny status</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Tożsamość na czacie</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Kolory wierszy czatu</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Powiadomienia o stanie</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Warunki</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Własne</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Czcionka</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opcje konta Gmail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Zapisane opisy</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Prywatność</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Tożsamość na rosterze</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Opisy statusu</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Tematy</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Drugie imię:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Powiadomienia wizualne</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Zaawansowane..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Wszystkie stany rozmowy\n"
-"Tylko dotyczące pisania\n"
-"Wyłączone"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Dowolny status"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
+
+#: ../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"
+msgstr ""
+"Pokazuj powiadomienia gdy mam status _zaraz wracam/nieobecny/zajęty/"
+"niewidoczny"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Włącz dźwięki, kiedy jestem _zajęty"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Zaraz wracam"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Zawsze używaj domyślnych apikacji OS X"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Zawsze używaj domyślnych apikacji OS X"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Zawsze używaj domyślnych apikacji OS X"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Pytaj o opis przy zmianie statusu na:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Automatyczne wykrywanie przy każdym uruchomieniu Gajima\n"
-"Zawsze używaj domyślnych aplikacji GNOME\n"
-"Zawsze używaj domyślnych aplikacji KDE\n"
-"Zawsze używaj domyślnych aplikacji Xfce\n"
-"Własne"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "P_ołącz przy starcie programu"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Wiadomość:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
-msgstr "Przy starcie zawsze sprawdzaj czy Gajim jest _domyślnym klientem Jabbera"
+msgstr ""
+"Przy starcie zawsze sprawdzaj czy Gajim jest _domyślnym klientem Jabbera"
+
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Tworzenie wiadomości"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Konfiguruj kolor i czcionkę interfejsu"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Contact's message:"
 msgstr "Wiadomość:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Contact's nickname:"
 msgstr "Pseudonim kontaktu:"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Własne"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
 msgstr ""
-"Oddzielne okno rostera, oddzielne okna czatów\n"
-"Oddzielne okno rostera, wspólne okno rozmów\n"
-"Jedno, wspólne okno dla rostera i rozmów\n"
-"Oddzielne okno rostera, rozmowy grupowane według konta\n"
-"Oddzielne okno rostera, rozmowy grupowane według typu"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Wyłączone"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Wyświetlaj aktywność kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Wyświetlaj _dodatkowe informacje o poczcie e-mail"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Wyświetlaj nastroje kontaktów z listy"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Wyświetlaj muzyczne ikonki kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Wyświetlaj awatary kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Wyświetlaj nastroje kontaktów z listy"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Wyświetlaj _opisy statusu kontaktu na liście kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:49
-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."
+#: ../data/gui/preferences_window.ui.h:58
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim 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/glade/preferences_window.glade.h:50
-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."
+#: ../data/gui/preferences_window.ui.h:59
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim 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/glade/preferences_window.glade.h:51
-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:60
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
+"kontaktach które zmieniają status na Rozłączony"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Ukryj przyciski w oknie rozmowy"
 
-#: ../data/glade/preferences_window.glade.h:54
-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:63
+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/glade/preferences_window.glade.h:55
-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"
+#: ../data/gui/preferences_window.ui.h:64
+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"
 
-#: ../data/glade/preferences_window.glade.h:56
-msgid "If checked, Gajim will change status to Away when the computer is unused."
-msgstr "Uaktywnienie tej opcji spowoduje, że Gajim będzie zmieniał status na Zaraz wracam gdy komputer nie będzie używany."
+#: ../data/gui/preferences_window.ui.h:65
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Uaktywnienie tej opcji spowoduje, że Gajim będzie zmieniał status na Zaraz "
+"wracam gdy komputer nie będzie używany."
 
-#: ../data/glade/preferences_window.glade.h:57
-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"
+#: ../data/gui/preferences_window.ui.h:66
+msgid ""
+"If checked, Gajim will change status to Not Available when the computer has "
+"not been used even longer"
+msgstr ""
+"Użycie tej opcji oznacza, że Gajim zmieni status na Niedostępny po dłuższym "
+"okresie bezczynności"
 
-#: ../data/glade/preferences_window.glade.h:58
-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:67
+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/glade/preferences_window.glade.h:59
-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:68
+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/glade/preferences_window.glade.h:60
-msgid "If checked, Gajim will display the activity of contacts in the roster window"
-msgstr "Zaznaczenie tej opcji spowoduje wyświetlanie aktywności kontaktów z listy kontaktów"
+#: ../data/gui/preferences_window.ui.h:69
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje wyświetlanie aktywności kontaktów z listy "
+"kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:61
-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:70
+#, 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)"
 
-#: ../data/glade/preferences_window.glade.h:62
-msgid "If checked, Gajim will display the tunes of contacts in the roster window"
-msgstr "Zaznaczenie tej opcji spowoduje wyświetlanie muzycznych ikonek w oknie listy kontaktów (roster oraz okno czatu)"
+#: ../data/gui/preferences_window.ui.h:71
+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/glade/preferences_window.glade.h:63
-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:72
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Zaznaczenie tej opcji spowoduje wyświetlanie muzycznych ikonek w oknie listy "
+"kontaktów (roster oraz okno czatu)"
 
-#: ../data/glade/preferences_window.glade.h:64
-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: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 ""
+"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/glade/preferences_window.glade.h:65
-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: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 ""
+"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/glade/preferences_window.glade.h:66
-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:75
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+"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:76
+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/glade/preferences_window.glade.h:67
-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: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 ""
+"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/glade/preferences_window.glade.h:68
-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:78
+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/glade/preferences_window.glade.h:69
-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:79
+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/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Loguj _zaszyfrowane wiadomości"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "_Spraw by okna rozmowy były zwarte"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Za_rządzaj..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Nigdy\n"
-"Tylko, kiedy wystąpią jakieś zdarzeniaZawsze\n"
-"Zawsze"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Nigdy"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Powiadomienia"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Powiadom mnie o kontaktach, które się _logują"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Powiadom mnie o kontaktach, które się _wylogowują "
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Powia_dom mnie o tym"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Powiadamiaj o nowej poczcie na koncie _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nigdy\n"
+"Tylko, kiedy wystąpią jakieś zdarzeniaZawsze\n"
+"Zawsze"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Zdarzenia"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
-"Otwórz okno\n"
-"Powiadom mnie o tym\n"
-"Pokaż tylko w rosterze"
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Wyświetl"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Ustawienia"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Serwer:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Pokaż tylko _listę kontaktów"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Pokaż _zdarzenie w obszarze powiadamiania"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../data/glade/preferences_window.glade.h:89
-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:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"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/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Sortuj kontakty według statusu"
 
-#: ../data/glade/preferences_window.glade.h:91
-#: ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Zestaw ikon _statusu:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Styl"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Motyw:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
-"The auto away status message. If empty, Gajim will not change the current status message\n"
+"The auto away status message. If empty, Gajim will not change the current "
+"status message\n"
 "$S will be replaced by previous status message\n"
 "$T will be replaced by auto-away timeout"
 msgstr ""
-"Opis automatycznego opisu statusu \"Zaraz Wracam\". Jeśli pusty, Gajim nie zmieni obecnego opisu\n"
+"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/glade/preferences_window.glade.h:98
+#: ../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"
+"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"
+"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\""
+"$T będzie zastąpione przez czas, po którym ma zostać ustawiono status "
+"\"Nieobecny\""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Użyj _domyślnej dla systemu"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your message:"
 msgstr "Twoja wiadomość:"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 msgid "Your nickname:"
 msgstr "Twój pseudonim:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "Automatyczny status '_Zaraz wracam' po:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "Prze_glądarka:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "Wyświetlaj informacje stanie kontaktu:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Emotikony:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "Menadżer _plików:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "Ignoruj wzbogaconą treść w wiadomościach"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "Klient _poczty:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "Automatyczny status '_Nieobecny' po:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Otwórz..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "Wróć do kolorów _domyślnych"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "Rodzaje powiadomień wysyłanych podczas rozmowy:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Informacja o statusie:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "_Podświetlanie URL:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Zachowanie okna:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "w _konferencji"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "w _liście kontaktów"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutach"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Poufne listy:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Dodaj / Edytuj regułę</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Lista reguł</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<p>Lista prywatności</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktywny w tej sesji"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "P_ołącz przy starcie programu"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "wszystkim"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Wszystko (łącznie z zubskrypcją)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Zezwól"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Odmów"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Kolejność:"
 
-#: ../data/glade/privacy_list_window.glade.h:12
-#: ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Poufna Lista"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "według autoryzacji"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "według grupy"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"brak\n"
-"obie\n"
-"od\n"
-"do"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Obustronna"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Od"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "pierwsza"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "druga"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "wysyłać mi wiadomości"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "wysyłać kwerendy"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "wysyłać mi status"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "widzieć mój status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresy</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Awatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Miasto:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Kraj:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Dział:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Nazwisko:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Imię i nazwisko</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Imię:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Strona domowa:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../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/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Imię:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Pseudonim:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Stanowisko:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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>:"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30
-#: ../src/vcard.py:332
+#: ../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>Rola:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../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/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Ulica:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sufiks:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Informacje"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Kliknij aby ustawić avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Informacje osobiste"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Praca"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Co chcesz zrobić?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Usuń konto _tylko z Gajima"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Usuń konto z Gajima i z _serwera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4
-#: ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380
-#: ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
-msgid "<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in your roster."
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Dodaj _kontakt..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "_Możliwości programu"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Przesyłanie plików"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Najczęściej Zadawane Pytania (w sieci)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Pomoc w sieci"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil, _Awatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Pokaż kontakty _połączone"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Pokaż trans_porty"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Pokaż kontakty _niepołączone"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Pokaż _listę kontaktów"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Konta"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Działania"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Zawartość"
-
-#: ../data/glade/roster_window.glade.h:18
-#: ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Ustawienia"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Zakończ"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Wyślij _wiadomość..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Widok"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Proszę czekać, trwa pobieranie formularza wyszukiwania..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Szukaj"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4
-#: ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "Informacje o kontakcie"
 
-#: ../data/glade/search_window.glade.h:5
-#: ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Szukaj"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "I_dź"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Zarejestruj w"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Od:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Odpowiedz na tę wiadomość"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Wyślij"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Wyślij wiadomość i zamknij okno"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Temat:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Do:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Wyślij i zamknij"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Autoryzuj"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
-msgid "Deny authorization from contact so he or she cannot know when you're connected"
-msgstr "Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś połączony"
+#: ../data/gui/subscription_request_window.ui.h:3
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+"Odmów autoryzacji kontaktowi, nie będzie on wówczas wiedział kiedy jesteś "
+"połączony"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Prośba o autoryzację"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "O_dmów"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synchronizacja: wybierz kontakty"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Wyłącz dźwięki"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Wyślij _wiadomość"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Pokój"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Pytaj:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Czas u niego/niej:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Zasób:</b>:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Subskrybcja:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Komentarze"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Ustawiony avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Informacje o kontakcie"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Więcej"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Używany avatar"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Czcionka</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Traffic</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Wejście XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Włącz"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Informacje/Zapytanie"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "Wiado_mość"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Obecność"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modyfikuj konto..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lokalny JID:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Informacje osobiste"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Zasoby:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Klient Jabbera w GTK+"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Cofnij potwierdzenie"
 
-#: ../src/adhoc_commands.py:296
-msgid "You are in process of executing command. Do you really want to cancel it?"
+#: ../src/adhoc_commands.py:299
+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:328
-#: ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Usługa wysłała niepoprawne dane"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Klient na %s anulował negocjację sesji"
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Usługa zwróciła komunikat błędu."
 
@@ -2782,8 +2780,7 @@ msgstr "Liczba całkowita"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96
-#: ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Kolor"
 
@@ -2921,144 +2918,135 @@ msgstr "szwedzki"
 msgid "Chinese (Ch)"
 msgstr "chiński (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Wybierz słownik"
 
 #. we are not connected
-#: ../src/chat_control.py:478
-#: ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/chat_control.py:479
-#: ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Przekreślenie"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Czcionka:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Usuń formatowanie"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Na pewno wysłać ten plik?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411
-#: ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "Szyfrowanie GPG włączone"
 
 #. Add to roster
-#: ../src/chat_control.py:1436
-#: ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253
-#: ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231
-#: ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060
-#: ../src/dialogs.py:1973
-#: ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610
-#: ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398
-#: ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578
-#: ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194
-#: ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Ten kontakt nie może przesyłać i odbierać plików."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844
-#: ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Nie ma przypisanego klucza GPG"
 
-#: ../src/chat_control.py:1845
-msgid "No GPG key is assigned to this contact. So you cannot encrypt messages with GPG."
-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:1928
+msgid ""
+"No GPG key is assigned to this contact. So you cannot encrypt messages with "
+"GPG."
+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:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "Szyfrowanie GPG wyłączone"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Sesja BĘDZIE logowana"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Sesja NIE BĘDZIE logowana"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "jest"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "NIE jest"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "będzie"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "NIE będzie"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "oraz autoryzowana"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3067,176 +3055,187 @@ msgstr ""
 "%(type)s szyfrowanie %(status)s aktywne %(authenticated)s.\n"
 "Twoja sesja %(logged)s będzie logowana."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Negocjowanie sesji zostało przerwane"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr "i BĘDZIE logowana"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr "i NIE BĘDZIE logowana"
 
-#: ../src/chat_control.py:2074
-msgid "Remote contact's identity not verified. Click the shield button for more details."
-msgstr "Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk tarczy po więcej szczegółów."
+#: ../src/chat_control.py:2158
+msgid ""
+"Remote contact's identity not verified. Click the shield button for more "
+"details."
+msgstr ""
+"Tożsamość zdalnego rozmówny nie jest zweryfikowana. Kliknij na przycisk "
+"tarczy po więcej szczegółów."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "Szyfrowanie E2E wyłączone"
 
-#: ../src/chat_control.py:2113
-#: ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Ta wiadomość NIE została zaszyfrowana"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, 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:2389
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to utracisz tę wiadomość."
-
-#: ../src/chat_control.py:2542
-#: ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483
-#: ../src/common/connection.py:420
-#: ../src/gajim.py:154
-#: ../src/session.py:134
+#: ../src/chat_control.py:2476
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
+"utracisz tę wiadomość."
+
+#: ../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
 msgid "Database Error"
 msgstr "Błąd bazy danych"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
-msgid "The database file (%s) cannot be read. Try to repair it or remove it (all history will be lost)."
-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)."
+msgid ""
+"The database file (%s) cannot be read. Try to repair it or remove it (all "
+"history will be lost)."
+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:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s ma teraz status %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../src/common/check_paths.py:129
-#: ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "tworzenie bazy danych z logami"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130
-#: ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148
-#: ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "tworzenie katalogu %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Zmień informację o statusie"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Zmień status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Ustaw typ widoczności i status opisowy"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Dostępny"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Nieobecny"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Nieobecny - rozłączony"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Status opisowy"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Status został zmieniony."
 
-#: ../src/common/commands.py:176
-#: ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Opuść pokoje"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s z pokoju %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Nie dołączyłeś do pokoju."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205
-#: ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55
-#: ../src/roster_window.py:809
-#: ../src/roster_window.py:1580
-#: ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Pokoje"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Opuściłeś pokoje:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Prześlij dalej nieprzeczytane wiadomości"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Wszystkie nieprzeczytane wiadomości zostały przesłane dalej."
 
@@ -3254,7 +3253,8 @@ msgstr "Pokaż tylko połączone i chętne do rozmowy kontakty."
 
 #: ../src/common/config.py:81
 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."
+msgstr ""
+"Czas w minutach, po którym twój status zostanie zmieniona na Zaraz wracam."
 
 #: ../src/common/config.py:82
 msgid "$S (Away as a result of being idle more than $T min)"
@@ -3262,11 +3262,13 @@ 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."
-msgstr "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas bezczynności"
+msgstr ""
+"$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas bezczynności"
 
 #: ../src/common/config.py:84
 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."
+msgstr ""
+"Czas w minutach, po którym twój status zostanie zmieniony na Niedostępny."
 
 #: ../src/common/config.py:85
 msgid "$S (Not available as a result of being idle more than $T min)"
@@ -3274,11 +3276,14 @@ 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."
-msgstr "$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas nieobecności"
+msgstr ""
+"$S zostanie zastąpiony bieżącym opisem stanu, $T przez czas nieobecności"
 
 #: ../src/common/config.py:88
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
-msgstr "Kiedy pokazać ikonę w obszarze powiadomienia. Może być 'nigdy', 'podczas_zdarzenia', 'zawsze'."
+msgstr ""
+"Kiedy pokazać ikonę w obszarze powiadomienia. Może być 'nigdy', "
+"'podczas_zdarzenia', 'zawsze'."
 
 #: ../src/common/config.py:93
 msgid "Incoming nickname color."
@@ -3322,16 +3327,14 @@ msgid "Status message text font."
 msgstr "Czcionka opisu."
 
 #: ../src/common/config.py:105
-msgid "List (space separated) of rows (accounts and groups) that are collapsed."
+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:482
-#: ../src/common/optparser.py:288
-#: ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499
-#: ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "domyślny"
 
@@ -3346,36 +3349,68 @@ msgid ""
 "'never' - never print time."
 msgstr ""
 "'always' - wyświetlaj czas każdej wiadomości.\n"
-"'sometmes' - czas wyświetlany jest w odstępach zdefiniowanych w zmiennej print_ichat_every_foo_minutes.\n"
+"'sometmes' - czas wyświetlany jest w odstępach zdefiniowanych w zmiennej "
+"print_ichat_every_foo_minutes.\n"
 "'never' - nigdy nie wyświetlaj czasu."
 
 #: ../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 "Wartość \"niedokładności\" od 1 do 4 (0 wyłącza \"okołozegarek\" [fuzzyclock]). 1 oznacza najbardziej precyzyjne wskazania zegara, 4 najmniej dokładne. Ustawienie to brane jest pod uwagę jedynie wtedy, gdy opcja print_time ustawiona jest na '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 ""
+"Wartość \"niedokładności\" od 1 do 4 (0 wyłącza \"okołozegarek"
+"\" [fuzzyclock]). 1 oznacza najbardziej precyzyjne wskazania zegara, 4 "
+"najmniej dokładne. Ustawienie to brane jest pod uwagę jedynie wtedy, gdy "
+"opcja print_time ustawiona jest na 'sometimes'."
 
 #: ../src/common/config.py:117
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Traktuj pary znaków * / _ jako znaki formatujące."
 
 #: ../src/common/config.py:118
-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 * *."
+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
-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 "Używa znaczników ReStructured oraz formatowania ASCII. Musisz mieć zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie http://docutils.sourceforge.net/docs/ref/rst/"
+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 ""
+"Używa znaczników ReStructured oraz formatowania ASCII. Musisz mieć "
+"zainstalowany pakiet docutils. Wyjaśnienie składni dostępne na stronie "
+"http://docutils.sourceforge.net/docs/ref/rst/"
 
 #: ../src/common/config.py:130
-msgid "Character to add after nickname when using nick completion (tab) in group chat."
-msgstr "Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko czat)"
+msgid ""
+"Character to add after nickname when using nick completion (tab) in group "
+"chat."
+msgstr ""
+"Znak dodawany do nicka przy użyciu autouzupełniania klawiszem TAB (tylko "
+"czat)"
 
 #: ../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 proponowany do dodania do nicka w sytuacji, gdy dany nick jest już używany przez innego uzytkownika czatu"
+msgid ""
+"Character to propose to add after desired nickname when desired nickname is "
+"used by someone else in group chat."
+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
-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 "Ta opcja pozwala na zdefiniowanie formatu czasu wyświetlanego w oknie rozmowy. Na przykład \"[%H:%M] \" spowoduje wyświetlenie szablonu \"[godzina:minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: http://docs.python.org/lib/module-time.html"
+msgid ""
+"This option let you customize timestamp that is printed in conversation. For "
+"exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
+"strftime for full documentation: http://docs.python.org/lib/module-time.html"
+msgstr ""
+"Ta opcja pozwala na zdefiniowanie formatu czasu wyświetlanego w oknie "
+"rozmowy. Na przykład \"[%H:%M] \" spowoduje wyświetlenie szablonu \"[godzina:"
+"minuta] \". Więcej informacji w dokumentacjy Pythona dotyczącą strftime: "
+"http://docs.python.org/lib/module-time.html"
 
 #: ../src/common/config.py:160
 msgid "Characters that are printed before the nickname in conversations"
@@ -3390,8 +3425,12 @@ msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
 
 #: ../src/common/config.py:166
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
-msgstr "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta rozmowy zostanie ponownie otwarta."
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
+msgstr ""
+"Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
+"rozmowy zostanie ponownie otwarta."
 
 #: ../src/common/config.py:167
 msgid "How many minutes should last lines from previous conversation last."
@@ -3406,12 +3445,18 @@ msgid "How many minutes back to request logs when a entering a groupchat."
 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."
+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)."
-msgstr "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne zachowanie klienta Mirabilis ICQ)."
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
+"zachowanie klienta Mirabilis ICQ)."
 
 #: ../src/common/config.py:174
 msgid "How many lines to store for Ctrl+KeyUP."
@@ -3419,48 +3464,94 @@ msgstr "Ile przechwywać linii dla kombinacji Ctrl+KeyUP."
 
 #: ../src/common/config.py:177
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Albo własny url zawierający %s, gdzie %s jest słowem/frazą, albo WIKTIONARY, co oznacza użycie wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+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:180
 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."
+msgstr ""
+"Jeśli ta opcja jest zaznaczona, to Gajim będzie mógł być sterowany zdalnie z "
+"wykorzystaniem gajim-remote."
 
 #: ../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."
-msgstr "Jeżeli opcja ustawiona jest na True, Gajim nasłuchuje komunikatów D-Bus wysyłanych przez NetworkManagera i zmienia status poszczególnych kont (o ile nie mają ustawionej opcji listen_to_network_manager) na False i synchronizują się ze statusem globalnym) w oparciu o status wykorzystywanego połączenia sieciowego."
+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żeli opcja ustawiona jest na True, Gajim nasłuchuje komunikatów D-Bus "
+"wysyłanych przez NetworkManagera i zmienia status poszczególnych kont (o ile "
+"nie mają ustawionej opcji listen_to_network_manager) na False i "
+"synchronizują się ze statusem globalnym) w oparciu o status wykorzystywanego "
+"połączenia sieciowego."
 
 #: ../src/common/config.py:182
-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."
+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:183
-msgid "Displayed chat state notifications in chat windows. Can be one of all, composing_only, disabled."
-msgstr "Informacje o statusie rozmówcy wyświetlane w oknie rozmowy. Przyjmuje wartości all, composing_only, disabled."
+msgid ""
+"Displayed chat state notifications in chat windows. Can be one of all, "
+"composing_only, disabled."
+msgstr ""
+"Informacje o statusie rozmówcy wyświetlane w oknie rozmowy. Przyjmuje "
+"wartości all, composing_only, disabled."
 
 #: ../src/common/config.py:185
-msgid "When not printing time for every message (print_time==sometimes), print it every x minutes."
-msgstr "W przypadku wybrania wyświetlania czasu nie dla każdej wiadomości (print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać czas nadejścia nowej wiadomości."
+msgid ""
+"When not printing time for every message (print_time==sometimes), print it "
+"every x minutes."
+msgstr ""
+"W przypadku wybrania wyświetlania czasu nie dla każdej wiadomości "
+"(print_time==sometimes), zmienna określa co ile minut Gajim ma wyświetlać "
+"czas nadejścia nowej wiadomości."
 
 #: ../src/common/config.py:186
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
 #: ../src/common/config.py:187
-msgid "Always ask before closing group chat tab/window in this space separated list 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ą)."
+msgid ""
+"Always ask before closing group chat tab/window in this space separated list "
+"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:188
-msgid "Never ask before closing group chat tab/window in this space separated list 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ą)."
+msgid ""
+"Never ask before closing group chat tab/window in this space separated list "
+"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: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)"
-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)"
+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 ""
+"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: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."
-msgstr "Oddzielona przecinkami lista hostów, którą wysyłamy w celu przesyłania plików, w przypadku tłumaczenia adresu/przekierowania portu."
+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 ""
+"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:194
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
@@ -3483,515 +3574,718 @@ msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
 #: ../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."
-msgstr "Lista modp-grup wykorzystywany w Diffie-Hellman, najwyższa preferencja jest pierwsza, oddzielonych przecinkiem. Odpowiednie grupy to 1, 2, 5, 14, 15, 16, 17 i 18. Wyższy numery są bardziej bezpiecznie, lecz obliczanie zajmie więcej czasu podczas rozpoczynania sesji."
+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 ""
+"Lista modp-grup wykorzystywany w Diffie-Hellman, najwyższa preferencja jest "
+"pierwsza, oddzielonych przecinkiem. Odpowiednie grupy to 1, 2, 5, 14, 15, "
+"16, 17 i 18. Wyższy numery są bardziej bezpiecznie, lecz obliczanie zajmie "
+"więcej czasu podczas rozpoczynania sesji."
 
 #: ../src/common/config.py:214
 msgid "Preview new messages in notification popup?"
 msgstr "Podgląd nowych wiadomości w oknie powiadomienia?"
 
 #: ../src/common/config.py:219
-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."
+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: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."
-msgstr "Jeśli ma wartość True, to Gajim jest zamykany po wciśnięciu przycisku X Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka systemowa."
+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 ""
+"Jeśli ma wartość True, to Gajim jest zamykany po wciśnięciu przycisku X "
+"Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
+"systemowa."
 
 #: ../src/common/config.py:221
-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."
+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:222
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "Jeśli ma wartość True, Gajim wyświetli ikonę na każdej karcie zawierającej nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od motywu."
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"Jeśli ma wartość True, Gajim wyświetli ikonę na każdej karcie zawierającej "
+"nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
+"motywu."
 
 #: ../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."
-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."
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window."
+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:228
+#: ../src/common/config.py:229
 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:229
-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 "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:230
-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 "Jeśli ma wartość False, to nie będziesz informowany o zmianie statusu lub opisu statusu przez kontakt, z którym rozmawiasz."
+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 ""
+"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:231
-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 "Zmienna przybiera wartości \"none\", \"all\" oraz \"in_and_out\". W przypadku ustawienia \"none\", Gajim nie będzie już powiadamiał o zmianie statusu (lub opisu stanu) przez innego użytkownika czatu. \"all\" spowoduje wyświetlanie wszystkich wiadomości o statusie każdego użytkownika. Wybranie \"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu użytkownika do pokoju lub jego opuszczeniu."
+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 ""
+"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: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."
+msgstr ""
+"Zmienna przybiera wartości \"none\", \"all\" oraz \"in_and_out\". W "
+"przypadku ustawienia \"none\", Gajim nie będzie już powiadamiał o zmianie "
+"statusu (lub opisu stanu) przez innego użytkownika czatu. \"all\" spowoduje "
+"wyświetlanie wszystkich wiadomości o statusie każdego użytkownika. Wybranie "
+"\"in_and_out\" nakazuje programowi wyświetlanie jedynie informacji o wejściu "
+"użytkownika do pokoju lub jego opuszczeniu."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Kolor tła dla logujących się kontaktów."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Kolor tła dla kontaktów w trakcie wylogowywania."
 
-#: ../src/common/config.py:236
-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:237
+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:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Nie pokazuj awatarów transportów."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Nie pokazuj okna rostera na pasku zadań."
 
-#: ../src/common/config.py:239
-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 "Jeżeli opcja ta jest aktywna oraz zainstalowano GTK+ i PyGTK w wersji nie niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie okna programu."
+#: ../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."
+msgstr ""
+"Jeżeli opcja ta jest aktywna oraz zainstalowano GTK+ i PyGTK w wersji nie "
+"niższej niż 2.8, odebrane a nie przeczytane wiadomości spowodują miganie "
+"okna programu."
 
-#: ../src/common/config.py:241
-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 "Demon Jabberd1.4 nie toleruje wysyłania \"sha info\" podczas wchodzenia do pokoju chronionego hasłem. Ustaw tą opcję na False aby zabronić Gajimowi wysyłania takiej informacji."
+#: ../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."
+msgstr ""
+"Demon Jabberd1.4 nie toleruje wysyłania \"sha info\" podczas wchodzenia do "
+"pokoju chronionego hasłem. Ustaw tą opcję na False aby zabronić Gajimowi "
+"wysyłania takiej informacji."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
-"'always_with_roster' - Like 'always' but the messages are in a single window along with the roster.\n"
+"'always_with_roster' - Like 'always' but the messages are in a single window "
+"along with the roster.\n"
 "'never' - All messages get their own window.\n"
 "'peracct' - Messages for each account are sent to a specific window.\n"
-"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a specific window."
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window."
 msgstr ""
 "Kontroluje zachowanie okna z nowymi wiadomościami.\n"
 "'always' - wszystkie wiadomości wysyłane są do tego samego okna.\n"
-"'always_with_roster' - jak 'always', ale wiadomości znajdują się w tym samym oknie, co roster.\n"
+"'always_with_roster' - jak 'always', ale wiadomości znajdują się w tym samym "
+"oknie, co roster.\n"
 "'never' - każda z wiadomości otrzymuje swoje własne okno.\n"
 "'peracct' - wiadomości dla każdego z kont mają wspólne okno.\n"
-"'pertype' - wiadomości określonego typu (np. rozmowa czy konferencja) mają wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie uruchomić program."
+"'pertype' - wiadomości określonego typu (np. rozmowa czy konferencja) mają "
+"wspólne okno. Aby uaktywnić dokonane w tej opcji zmiany, trzeba ponownie "
+"uruchomić program."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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."
+msgstr ""
+"Jeżeli ustawisz tą opcję na False, Gajim nie będzie wyświetlał avatara w "
+"oknie rozmowy."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 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."
+msgstr ""
+"Ustawienie 'True' spowoduje zamykanie okna/karty rozmowy po naciśnięciu "
+"klawisza ESC."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Ukrywa przyciski w oknie czatu."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Ukrywa banner w oknie czatu"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Usuwa banner podczas rozmowy dwóch osób"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 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:251
-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 "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: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."
+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:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Wcięcie stosowane przy łaczeniu tych samych nicków."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Płynne przewijanie w oknie rozmowy"
 
-#: ../src/common/config.py:254
-msgid "List of colors, separated by \":\", that will be used to color nicknames in group chats."
-msgstr "Lista kolorów, oddzielonych \":\", które używane będą do kolorowania nicków w oknach czatu."
-
 #: ../src/common/config.py:255
-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."
+msgid ""
+"List of colors, separated by \":\", that will be used to color nicknames in "
+"group chats."
+msgstr ""
+"Lista kolorów, oddzielonych \":\", które używane będą do kolorowania nicków "
+"w oknach czatu."
 
 #: ../src/common/config.py:256
-msgid "Should we show the confirm metacontacts creation dialog or not? Empty string means we never show the dialog."
-msgstr "Czy program powinien potwierdzać za każdym razem utworzenie metakontaktu? Pusty ciąg spowoduje, że okno dialogowe nie będzie wyświetlane."
+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:257
-msgid "Should we show the confirm block contact dialog or not? Empty string means we never show the dialog."
-msgstr "Wyświetlać potwierdzenie blokowania kontaktu? Pusta linia oznacza, że potwierdzenie nie będzie wyświetlane."
+msgid ""
+"Should we show the confirm metacontacts creation dialog or not? Empty string "
+"means we never show the dialog."
+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:258
-msgid "Should we show the confirm custom status dialog or not? Empty string means we never show the dialog."
-msgstr "Wyświetlać potwierdzenie statusu indywidualnego? Pusta linia oznacza, że potwierdzenie nie będzie wyświetlane."
+msgid ""
+"Should we show the confirm block contact dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Wyświetlać potwierdzenie blokowania kontaktu? Pusta linia oznacza, że "
+"potwierdzenie nie będzie wyświetlane."
 
 #: ../src/common/config.py:259
-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żeli opcja ustawiona jest na True, w oknie modyfikacji właściwości konta będziesz mógł korzystać z ujemnych priorytetów. Zauważ, że po zalogowaniu z ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego serwera."
+msgid ""
+"Should we show the confirm custom status dialog or not? Empty string means "
+"we never show the dialog."
+msgstr ""
+"Wyświetlać potwierdzenie statusu indywidualnego? Pusta linia oznacza, że "
+"potwierdzenie nie będzie wyświetlane."
 
 #: ../src/common/config.py:260
-msgid "If True, Gajim will use Gnome Keyring (if available) to store account passwords."
-msgstr "Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie używał Menedżera bazy kluczy GNOME."
+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żeli opcja ustawiona jest na True, w oknie modyfikacji właściwości konta "
+"będziesz mógł korzystać z ujemnych priorytetów. Zauważ, że po zalogowaniu z "
+"ujemnym priorytetem nie będziesz otrzymywał żadnych wiadomości z twojego "
+"serwera."
 
 #: ../src/common/config.py:261
-msgid "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store account passwords."
-msgstr "Po włączeniu Gajim użyje aplikacji KDE Wallet do przechowywania haseł (o ile biblioteka kwalletcli jest zainstalowana)."
+msgid ""
+"If True, Gajim will use Gnome Keyring (if available) to store account "
+"passwords."
+msgstr ""
+"Jeśli opcja ta ustawiona jest na True, do przechowywania haseł Gajim będzie "
+"używał Menedżera bazy kluczy GNOME."
 
 #: ../src/common/config.py:262
-msgid "If True, Gajim will show number of online and total contacts in account and group rows."
-msgstr "Jeśli opcja ustawiona jest na True, Gajim będzie wyświetlał liczbę połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz grupy"
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+"Po włączeniu Gajim użyje aplikacji KDE Wallet do przechowywania haseł (o ile "
+"biblioteka kwalletcli jest zainstalowana)."
 
 #: ../src/common/config.py:263
-msgid "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages as if they were of this type"
-msgstr "Przyjmuje wartość pustą, 'chat' lub 'normal'. Dwie ostatnie określają czy Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą wiadomość"
+msgid ""
+"If True, Gajim will show number of online and total contacts in account and "
+"group rows."
+msgstr ""
+"Jeśli opcja ustawiona jest na True, Gajim będzie wyświetlał liczbę "
+"połączonych kontaktów oraz ogólną liczbę kontaktów dla każdego konta oraz "
+"grupy"
 
 #: ../src/common/config.py:264
-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żeli ustawiono na 'True', Gajim przewinie listę kontaktów i wybierze ten kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu nie jest już otwarte."
+msgid ""
+"Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
+"as if they were of this type"
+msgstr ""
+"Przyjmuje wartość pustą, 'chat' lub 'normal'. Dwie ostatnie określają czy "
+"Gajim będzie traktował każdą przychodzącą wiadomość jako czat lub pojedynczą "
+"wiadomość"
 
 #: ../src/common/config.py:265
-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 ""
+"If True, Gajim will scroll and select the contact who sent you the last "
+"message, if chat window is not already opened."
+msgstr ""
+"Jeżeli ustawiono na 'True', Gajim przewinie listę kontaktów i wybierze ten "
+"kontakt, który wysłał ci ostatnią wiadomość, ale tylko wtedy gdy okno czatu "
+"nie jest już otwarte."
 
 #: ../src/common/config.py:266
-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."
+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:267
-msgid "Maximum number of lines that are printed in conversations. Oldest lines are cleared."
-msgstr "Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są usuwane."
+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:268
-msgid "If True, notification windows from notification-daemon will be attached to systray icon."
-msgstr "Po nadaniu wartości True okna powiadomień będą połączone z obszarem powiadomień."
+msgid ""
+"Maximum number of lines that are printed in conversations. Oldest lines are "
+"cleared."
+msgstr ""
+"Maksymalna ilość linii, jaka jest wyświetlana podczas rozmów. Najstarsze są "
+"usuwane."
 
 #: ../src/common/config.py:269
-msgid "Choose interval between 2 checks of idleness."
-msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
+msgid ""
+"If True, notification windows from notification-daemon will be attached to "
+"systray icon."
+msgstr ""
+"Po nadaniu wartości True okna powiadomień będą połączone z obszarem "
+"powiadomień."
 
 #: ../src/common/config.py:270
-msgid "Change the value to change the size of latex formulas displayed. The higher is larger."
-msgstr "Zmień rozmiar pokazywanych formuł latex-a."
+msgid "Choose interval between 2 checks of idleness."
+msgstr "Wybierz odstęp czasu pomiędzy dwoma sprawdzeniami bezczynności."
 
 #: ../src/common/config.py:271
-msgid "Valid uri schemes. Only schemes in this list will be accepted as \"real\" uri. (mailto and xmpp are handled separately)"
-msgstr "Wzorce ważnych uri. Tylko wzorce z tej listy będzie przyjmowane jako \"prawdziwe\" uri. (mailto i xmpp są traktowane oddzielnie)"
+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:272
-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 "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ń!"
+msgid ""
+"Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
+"uri. (mailto and xmpp are handled separately)"
+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:273
-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."
+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 ""
+"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:274
-msgid "When is self contact row displayed. Can be \"always\", \"when_other_resource\" or \"never\""
+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:275
+msgid ""
+"When is self contact row displayed. Can be \"always\", \"when_other_resource"
+"\" or \"never\""
+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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
 msgstr ""
 
-#: ../src/common/config.py:286
-msgid "Priority will change automatically according to your status. Priorities are defined in autopriority_* options."
-msgstr "Priorytet ulegnie automatycznej zmianie, wraz ze zmianą statusu. Priorytety zdefiniowane są opcjach rozpoczynających się od autopriority_*."
+#: ../src/common/config.py:296
+msgid ""
+"Priority will change automatically according to your status. Priorities are "
+"defined in autopriority_* options."
+msgstr ""
+"Priorytet ulegnie automatycznej zmianie, wraz ze zmianą statusu. Priorytety "
+"zdefiniowane są opcjach rozpoczynających się od autopriority_*."
 
-#: ../src/common/config.py:294
-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 używany przy automatycznym połączeniu. Może być: dostępny, chętny do 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: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"
+msgstr ""
+"Status używany przy automatycznym połączeniu. Może być: dostępny, chętny do "
+"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:295
+#: ../src/common/config.py:305
 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:297
-msgid "If True, Contacts requesting authorization will be automatically accepted."
+#: ../src/common/config.py:307
+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:298
-msgid "If False, this account will be disabled and will not appear in roster window."
+#: ../src/common/config.py:308
+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:301
-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:311
+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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Włączono szyfrowanie ESession dla tego konta."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
-msgstr "Czy Gajim powinien automatycznie zaczynać zaszyfrowaną sesje jeśli to możliwe?"
+msgstr ""
+"Czy Gajim powinien automatycznie zaczynać zaszyfrowaną sesje jeśli to "
+"możliwe?"
 
-#: ../src/common/config.py:305
-msgid "Ordered list (space separated) of connection type to try. Can contain tls, ssl or plain"
-msgstr "Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów połączeń. Może zawierać tls, ssl lub plain"
+#: ../src/common/config.py:315
+msgid ""
+"Ordered list (space separated) of connection type to try. Can contain tls, "
+"ssl or plain"
+msgstr ""
+"Lista połączeń (rozdzielona spacjami) zawierająca wykaz rodzajów połączeń. "
+"Może zawierać tls, ssl lub plain"
 
-#: ../src/common/config.py:306
-msgid "Show a warning dialog before sending password on an plaintext connection."
+#: ../src/common/config.py:316
+msgid ""
+"Show a warning dialog before sending password on an plaintext connection."
 msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Pokaż ostrzeżenie przed użyciem standardowej biblioteki SSL."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr "Pokaż ostrzeżenie przed wysłaniem hasła nieszyfrowanym połączeniem."
+
+#: ../src/common/config.py:320
 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ł."
+msgstr ""
+"Lista błędów (rozdzielona spacjami) zawierająca wykaz błędów ssl, które "
+"program będzie ignorował."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Wysyłanie białych znaków po nieaktywności"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "Wysyłanie pingu XMPP po nieaktywności"
 
-#: ../src/common/config.py:323
-msgid "How many seconds to wait for the answer of ping alive packet before we try to reconnect."
-msgstr "Czas oczekiwania (w sekundach) na odpowiedź na pakiet podtrzymujący połączenie przed podjęciem próby ponownego połączenia."
+#: ../src/common/config.py:334
+msgid ""
+"How many seconds to wait for the answer of ping alive packet before we try "
+"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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Obejście dla Jabberd2"
 
-#: ../src/common/config.py:330
-msgid "If checked, Gajim will use your IP and proxies defined in file_transfer_proxies option for file transfer."
-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:341
+msgid ""
+"If checked, Gajim will use your IP and proxies defined in "
+"file_transfer_proxies option for file transfer."
+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:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Odpowiedź na żądanie potwierdzenia"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Wyślij żądanie potwierdzenia"
 
-#: ../src/common/config.py:353
-msgid "When negotiating an encrypted session, should Gajim assume you want your messages to be logged?"
-msgstr "Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją logować?"
+#: ../src/common/config.py:366
+msgid ""
+"When negotiating an encrypted session, should Gajim assume you want your "
+"messages to be logged?"
+msgstr ""
+"Czy podczas negocjowania szyfrowanej sesji Gajim ma przyjąć, że chcesz ją "
+"logować?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Wypełnij informacje o kontakcie, który chcesz dodać"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Czy OpenPGP jest włączone dla tego kontaktu?"
 
-#: ../src/common/config.py:417
-msgid "Should Gajim automatically start an encrypted session with this contact when possible?"
-msgstr "Czy Gajim powinien automatycznie rozpoczynać zaszyfrowana sesję z tym kontaktem, jeśli to możliwe?"
+#: ../src/common/config.py:432
+msgid ""
+"Should Gajim automatically start an encrypted session with this contact when "
+"possible?"
+msgstr ""
+"Czy Gajim powinien automatycznie rozpoczynać zaszyfrowana sesję z tym "
+"kontaktem, jeśli to możliwe?"
 
-#: ../src/common/config.py:418
-#: ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 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:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "all lub komunikaty stanu rozdzielone spacjami"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' lub 'both'"
 
-#: ../src/common/config.py:429
-#: ../src/common/config.py:431
-#: ../src/common/config.py:432
-#: ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'yes', 'no' lub \""
 
-#: ../src/common/config.py:442
-#: ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Śpię"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:444
-#: ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Oglądam film."
 
-#: ../src/common/config.py:446
-#: ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Pracuję."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Dostępny."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Chętny do rozmowy."
 
-#: ../src/common/config.py:461
-#: ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Zaraz wracam."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Nieobecny."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Nie przeszkadzać."
 
-#: ../src/common/config.py:464
-#: ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Żegnaj!"
 
-#: ../src/common/config.py:475
-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 "Dźwięk, który zostanie odtworzony, gdy wiadomość MUC będzie zawierać jeden z wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać będzie twój pseudonim."
+#: ../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."
+msgstr ""
+"Dźwięk, który zostanie odtworzony, gdy wiadomość MUC będzie zawierać jeden z "
+"wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
+"będzie twój pseudonim."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 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:485
-#: ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:489
-#: ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../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:251
-msgid "Wrong host"
-msgstr "Błędna nazwa hosta"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Niepoprawny adres lokalny? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, 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:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Rejestracja zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Rejestracja z %s zakończyła się sukcesem"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Rejestracja nie powiodła się"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, 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:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481
-#: ../src/common/connection.py:418
-#: ../src/gajim.py:354
+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: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
 msgid "Disk Write Error"
 msgstr "Błąd zapisu na dysk"
 
-#: ../src/common/connection_handlers.py:1225
-#: ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Niewidoczność nie jest obsługiwana"
 
-#: ../src/common/connection_handlers.py:1226
-#: ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Konto %s nie obsługuje niewidoczności."
 
-#: ../src/common/connection_handlers.py:1919
-#: ../src/common/connection.py:233
-#: ../src/config.py:1940
-#: ../src/config.py:1949
-#: ../src/config.py:2008
-#: ../src/config.py:3360
-#: ../src/dataforms_widget.py:577
-#: ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Doszła wiadomość od nieprawidłowego JID, będzie zignorowana"
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484
-#: ../src/common/connection.py:421
-#: ../src/gajim.py:155
-#: ../src/session.py:135
+#: ../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)."
-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)."
+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_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Pseudonim jest niedozwolony: %s"
@@ -3999,80 +4293,84 @@ msgstr "Pseudonim jest niedozwolony: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310
-#: ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Osiągnięto maksymalną liczbę użytkowników dla %s"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zostałeś zabanowany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Pokój %s nie istnieje."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Twój pseudonim musi być używany w pokoju %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nie jesteś na liście uczestników rozmów w pokoju %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Pokój został usunięty"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "W zamian możesz dołączyć do pokoju %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, 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ąć"
+msgid ""
+"JID %s is not RFC compliant. It will not be added to your roster. Use roster "
+"management tools such as http://jru.jabberstudio.org/ to remove it"
+msgstr ""
+"Jid %s nie jest kompatybilny z RFC. Nie zostanie dodany do listy kontaktów. "
+"Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
+"jabberstudio.org/ aby go usunąć"
 
 #: ../src/common/connection.py:68
 msgid "Unable to get issuer certificate"
@@ -4202,28 +4500,29 @@ msgstr "Tym kluczem nie można podpisywać certyfikatu"
 msgid "Application verification failure"
 msgstr "Błąd weryfikacji aplikacji"
 
-#: ../src/common/connection.py:234
-#: ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 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."
+msgstr ""
+"Komunikat o statusie obecności nie jest podpisany, nie przypisano mu też "
+"klucza."
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ta wiadomość jest zaszyfrowana (Zobacz :XEP: '27']"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4232,80 +4531,80 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Połącz ponownie ręcznie."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
-msgstr "Serwer %(name)s udzielił nieprawidłowej odpowiedzi na żądanie rejestracji: %(error)s"
+msgstr ""
+"Serwer %(name)s udzielił nieprawidłowej odpowiedzi na żądanie rejestracji: %"
+"(error)s"
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Serwer %s przesłał niezgodny formularz rejestracyjny"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nieznany błąd SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Niepoprawna odpowiedź"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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"
+msgstr ""
+"Transport %(name)s udzielił nieprawidłowej odpowiedzi na żądanie "
+"rejestracji: %(error)s"
 
-#: ../src/common/connection.py:1075
-#: ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:1076
-#: ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Serwer odpowiedział: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Połączenie z serwerem proxy nie powiodło się"
 
-#: ../src/common/connection.py:1125
-#: ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie można połączyć się %s"
 
-#: ../src/common/connection.py:1126
-#: ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, 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:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4314,7 +4613,7 @@ msgstr ""
 "\n"
 "Błąd SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4323,73 +4622,69 @@ msgstr ""
 "\n"
 "Nieznany błąd SSL: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Błąd usuwaniu listy prywatności"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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 "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."
+msgid ""
+"Privacy list %s has not been removed. It is maybe active in one of your "
+"connected resources. Deactivate it and try again."
+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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Wysłany kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Wyślij kontakty:"
 
-#: ../src/common/connection.py:1703
-#: ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Nie wysłano z powodu statusu 'niewidoczny'"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Błąd przy usuwaniu konta"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Wypisanie się z serwera %(server)s nie powiodło się: %(error)s"
 
-#: ../src/common/contacts.py:129
-#: ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Obserwatorzy"
 
-#: ../src/common/contacts.py:133
-#: ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55
-#: ../src/disco.py:119
-#: ../src/disco.py:120
-#: ../src/disco.py:1464
-#: ../src/gui_interface.py:413
-#: ../src/roster_window.py:848
-#: ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572
-#: ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transporty"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Spoza listy kontaktów"
 
@@ -4398,36 +4693,53 @@ msgstr "Spoza listy kontaktów"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus nie działa prawidłowo na tym komputerze"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "Nie znaleziono biblioteki pysqlite2 (lub python-pysqlite2). Kończenie pracy programu..."
+#: ../src/common/dbus_support.py:54
+#, 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"
+
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "D-Bus nie działa prawidłowo na tym komputerze"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Baza danych nie może zostać odczytana."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Usługa nie jest dostępna. Gajim nie działa lub remote_control ma wartość False"
+msgstr ""
+"Usługa nie jest dostępna. Gajim nie działa lub remote_control ma wartość "
+"False"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Nie znaleziono interfejsu DBus.\n"
+"Zapoznaj się z uwagami na stronie http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Nie znaleziono interfejsu DBus.\n"
 "Zapoznaj się z uwagami na stronie http://trac.gajim.org/wiki/GajimDBus"
@@ -4514,7 +4826,7 @@ msgstr "za pięć wpół do %(0)s"
 
 # should be:
 # wpół do %(1)s
-# because in Polish it means "thirty to (hour)" and NOT "thirty after (hour)" poedit does not accept this :\
+# because in Polish it means "thirty to (hour)" and NOT "thirty after (hour)" poedit does not accept this :#: ../src/common/fuzzyclock.py:46
 #: ../src/common/fuzzyclock.py:46
 #, python-format
 msgid "half past %(0)s"
@@ -4550,8 +4862,7 @@ msgstr "za pięć %(1)s"
 msgid "%(1)s o'clock"
 msgstr "godzina %(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 "Noc"
 
@@ -4587,8 +4898,7 @@ msgstr "Późny wieczór"
 msgid "Start of week"
 msgstr "Początek tygodnia"
 
-#: ../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 "Środek tygodnia"
 
@@ -4600,208 +4910,206 @@ msgstr "Koniec tygodnia"
 msgid "Weekend!"
 msgstr "Weekend!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Niepoprawna litera w nazwie użytkownika."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Wymagany adres serwera."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Niepoprawna litera w nazwie hosta."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Niepoprawna litera w zasobach."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Zajęty"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Zajęty"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "Nie_obecny"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Chętny do rozmowy"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Chętny do rozmowy"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Dostępny"
 
-#: ../src/common/helpers.py:212
-#: ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Dostępny"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Łączę się"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "Zaraz _wracam"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "R_ozłączony"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Rozłączony"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "N_iewidoczny"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?contact ma status: Wystąpiły błędy"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Posiadane autoryzacje: Brak"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Do"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Obustronna"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Poproś (o autoryzację): Brak"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Autoryzuj"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Funkcja kontaktu w pokoju: Brak"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderatorzy"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Uczestnicy"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Goście"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Gość"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Powiązanie kontaktu z czata: brak"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Właściciel"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Uczestnik"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "jest skupiony na rozmowie"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "robi coś innego"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "przerwał pisanie wiadomości"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "zamknął okno lub kartę rozmowy"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049
-#: ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -4809,24 +5117,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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " z pokoju %s"
 
-#: ../src/common/helpers.py:1065
-#: ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " od użytkownika %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1074
-#: ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -4834,12 +5140,49 @@ msgstr[0] "%d oczekująca wiadomość"
 msgstr[1] "%d oczekujące wiadomości"
 msgstr[2] "%d oczekujących wiadomości"
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Konfiguracja pokoju"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+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"
@@ -4849,18 +5192,74 @@ msgstr "Błąd przy wykonywaniu \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s nie jest prawidłowym poziomem logowania"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Domyśla wiadomość"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Rozmiar: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/common/optparser.py:297
-#: ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyjan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "indeksowanie archiwum rozmów"
 
@@ -5281,8 +5680,7 @@ msgstr "Jem lunch"
 msgid "Exercising"
 msgstr "Ćwiczę"
 
-#: ../src/common/pep.py:133
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:133 ../src/common/pep.py:178
 msgid "Cycling"
 msgstr "Jeżdżę na rowerze"
 
@@ -5498,19 +5896,19 @@ msgstr "Uczę się"
 msgid "Writing"
 msgstr "Piszę"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Nieznany wykonawca"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Nieznany tytuł"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Nieznany album"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5520,19 +5918,27 @@ msgstr ""
 "z <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
-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."
+#: ../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:301
-msgid "[This is part of an encrypted session. If you see this message, something went wrong.]"
-msgstr "[To jest część zaszyfrowanej wiadomości. Jeżeli widzisz tą wiadomość, oznacza to, że coś poszło źle.]"
+#: ../src/common/stanza_session.py:303
+msgid ""
+"[This is part of an encrypted session. If you see this message, something "
+"went wrong.]"
+msgstr ""
+"[To jest część zaszyfrowanej wiadomości. Jeżeli widzisz tą wiadomość, "
+"oznacza to, że coś poszło źle.]"
 
 #: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
@@ -5585,8 +5991,10 @@ 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:359
-msgid "Connection to host could not be established: Timeout while sending data."
-msgstr "Nie można ustanowić połączenia z hostem. Timeout podczas wysyłania danych."
+msgid ""
+"Connection to host could not be established: Timeout while sending data."
+msgstr ""
+"Nie można ustanowić połączenia z hostem. Timeout podczas wysyłania danych."
 
 #: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
@@ -5594,250 +6002,237 @@ msgstr "Nie można ustanowić połączenia z hostem. Timeout podczas wysyłania
 msgid "Error while adding service. %s"
 msgstr "Błąd przy dodawaniu usługi %s"
 
-#: ../src/config.py:157
-#: ../src/config.py:586
-msgid "Disabled"
-msgstr "Wyłączone"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Domyśla wiadomość"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Włączone"
 
-#: ../src/config.py:654
-#: ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Brak słownika dla tego języka (%s)"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
-msgid "You have to install %s dictionary to use spellchecking, or choose another language by setting the speller_language option."
-msgstr "Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać inny język korzystać z opcji speller_langugage."
+msgid ""
+"You have to install %s dictionary to use spellchecking, or choose another "
+"language by setting the speller_language option."
+msgstr ""
+"Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
+"inny język korzystać z opcji speller_langugage."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
 #. Name column
-#: ../src/config.py:1394
-#: ../src/dialogs.py:2232
-#: ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014
-#: ../src/disco.py:831
-#: ../src/disco.py:1690
-#: ../src/disco.py:1992
-#: ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Czy zalogować się ponownie?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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."
+msgstr ""
+"Jeżeli chcesz by wszelkie zmiany odniosły natychmiastowy skutek, musisz "
+"zalogować się ponownie."
 
-#: ../src/config.py:1620
-#: ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1785
-#: ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Nieprzeczytane wiadomości"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
-msgstr "Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
+msgstr ""
+"Przejrzyj wszystkie niepotwierdzone zdarzenia przed usunięciem tego konta."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Masz otwarte okno rozmowy na koncie %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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ć?"
+msgstr ""
+"Wszystkie otwarte zakładki rozmów i czatów zostaną zamknięte. Kontynuować?"
 
-#: ../src/config.py:1825
-#: ../src/config.py:2348
-#: ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 msgid "To change the account name, you must read all pending events."
-msgstr "Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
+msgstr ""
+"Aby zmienić nazwę konta, musisz przeczytać wszystkie zaległe wiadomości."
 
-#: ../src/config.py:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Konto o takiej nazwie już istnieje"
 
-#: ../src/config.py:1837
-msgid "This name is already used by another of your accounts. Please choose another name."
+#: ../src/config.py:1942
+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:1841
-#: ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Zmień nazwę konta"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Wpisz nową nazwę dla kontaktu %s."
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:2158
-#: ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:2159
-#: ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Brak tajnego klucza OpenPGP."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Wybór klucza OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231
-#: ../src/dialogs.py:2031
-#: ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405
-#: ../src/disco.py:477
-#: ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Twój serwer nie akceptuje Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Twój serwer nie potrafi zapisać informacji osobistych."
 
-#: ../src/config.py:2349
-#: ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "Aby wyłączyć konto, musisz się rozłączyć."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Konto o takiej nazwie już istnieje."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
-msgstr "Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
+msgstr ""
+"Proszę go zmienić lub usunąć przed uaktywnieniem komunikacji link-local."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Lista kontaktów zablokowanych"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "_Lista uczestników"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "_Lista właścicieli"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "_Administratorzy"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600
-#: ../src/disco.py:838
-#: ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Powód"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Nick"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Funkcja:"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Blokuję użytkownika..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -5845,11 +6240,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz zablokować?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Dodaję członka..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -5857,11 +6252,11 @@ msgstr ""
 "<b>Status którego użytkownika chcesz zmienić?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Dodaję właściciela..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -5869,11 +6264,11 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić właścicielem pokoju?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Dodaję administratora..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -5881,7 +6276,7 @@ msgstr ""
 "<b>Którego użytkownika chcesz uczynić administratorem?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -5897,123 +6292,149 @@ 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:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2785
-#: ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Emotoikony wyłączone"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2786
-#: ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2787
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Połączenie z serwerem proxy nie powiodło się"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "<b>Co chcesz zrobić?</b>"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Usuń konto _tylko z Gajima"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Domyślny"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Wszystkie"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Jedynie wejdź i wyjdź"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Żaden"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Nowa rozmowa grupowa"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:3001
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:3129
+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:3119
-#: ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/config.py:3120
-#: ../src/config.py:3134
-#: ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Niedozwolony znak"
 
-#: ../src/config.py:3133
-#: ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Niepoprawny pokój"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:3300
-#: ../src/config.py:3306
-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 "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: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."
+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:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Wpisz adres serwera, na którym chcesz się zarejestrować."
 
-#: ../src/config.py:3439
-#: ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Certyfikat znajduje się już w pliku"
 
-#: ../src/config.py:3440
-#: ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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."
+msgstr ""
+"Ten certyfikat znajduje się już w pliku %s, więc nie zostanie ponownie "
+"dodany."
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6028,8 +6449,7 @@ msgstr ""
 "Błąd SSL: %(error)s\n"
 "Czy nadal chcesz się połączyć z tym serwerem?"
 
-#: ../src/config.py:3516
-#: ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6040,60 +6460,59 @@ msgstr ""
 "Odcisk klucza SHA1 certyfikatu:\n"
 "%s"
 
-#: ../src/config.py:3543
-#: ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Otrzymano pierwszą wiadomość"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Otrzymałeś następną wiadomość"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Otrzymałeś następną wiadomość w tle"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt połączył się"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Wiadomość została wysłana"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Podświetlenie wiadomości z czatu"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Otrzymano wiadomość na czacie"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Nowa poczta na koncie Gmail"
 
@@ -6115,44 +6534,44 @@ msgstr ""
 "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju\n"
 "od momentu gdy ostatni raz odwiedziłeś/odwiedziłaś ten pokój"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Cytuj"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Otwórz jako _odnośnik"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6161,8 +6580,7 @@ msgstr[1] "%i dni temu"
 msgstr[2] "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330
-#: ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
@@ -6180,8 +6598,7 @@ msgstr "Wprowadzony JID znajduje się już na liście. Wybierz inny."
 msgid "new@jabber.id"
 msgstr "nowy@jabber.id"
 
-#: ../src/dataforms_widget.py:596
-#: ../src/dataforms_widget.py:598
+#: ../src/dataforms_widget.py:596 ../src/dataforms_widget.py:598
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "nowy%d@jabber.id"
@@ -6230,7 +6647,8 @@ msgid "Overwrite Status Message?"
 msgstr "Zmienić opis statusu?"
 
 #: ../src/dialogs.py:794
-msgid "This name is already used. Do you want to overwrite this status message?"
+msgid ""
+"This name is already used. Do you want to overwrite this status message?"
 msgstr "Status o tej nazwie jest w użyciu. Czy chcesz go zmienić?"
 
 #: ../src/dialogs.py:802
@@ -6266,179 +6684,177 @@ msgstr "Adres _Yahoo:"
 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:874
+#: ../src/dialogs.py:875
 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:1035
-#: ../src/dialogs.py:1041
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Niepoprawny identyfikator użytkownika"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "ID użytkownika nie może zawierać zasobu."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Ty nie możesz dodać siebie do swojej listy kontaktów."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakt jest już na liście kontaktów"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ID uzytkownika:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Wersja GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Wersja PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Bieżący deweloperzy:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Poprzedni deweloperzy:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "Podziękowania:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Tłumaczenie na język polski: Witold Kieraś\n"
 "Maciej Chojnacki <maciej@chojnacki.name>Sławomir Domagała <godlark@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, 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 ""
-"Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać inny język korzystać z opcji speller_langugage.\n"
+"Musisz zainstalować słownik %s aby aktywować sprawdzanie pisowni lub wybrać "
+"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:1830
-#: ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Używany przez ciebie pseudonim zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:2026
-#: ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Niepoprawne konto"
 
-#: ../src/dialogs.py:2161
-msgid "You have to choose an account from which you want to join the groupchat."
+#: ../src/dialogs.py:2301
+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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Niepoprawny pseudonim"
 
-#: ../src/dialogs.py:2175
-#: ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Proszę wprowadzić JID konferencji w postaci pokój@serwer."
 
-#: ../src/dialogs.py:2182
-#: ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Używane przez ciebie Jabber ID zawiera niedozwolone znaki."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "To nie jest czat"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nie jest nazwą czatu."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Nie możesz zsynchronizować kontaktów przy niektywnym połączeniu."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "To konto nie jest połączone z serwerem"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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."
+msgstr ""
+"Nie możesz synchronizować kontaktów z kontem, które nie jest połączone."
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Synchronizuj"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowę z konta %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowę"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6447,352 +6863,322 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384
-#: ../src/dialogs.py:2767
-#: ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:2385
-#: ../src/dialogs.py:2768
-#: ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:2394
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Niepoprawny JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nie można sparsować \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 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:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469
-#: ../src/notify.py:263
-#: ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:2471
-#: ../src/notify.py:271
-#: ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473
-#: ../src/notify.py:294
-#: ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:2473
-#: ../src/notify.py:275
-#: ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
 #. private message
-#: ../src/dialogs.py:2474
-#: ../src/notify.py:282
-#: ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:2474
-#: ../src/gui_interface.py:1315
-#: ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Nowy adres e-mail"
 
-#: ../src/dialogs.py:2476
-#: ../src/gui_interface.py:1382
-#: ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:2478
-#: ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349
-#: ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:2480
-#: ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449
-#: ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/dialogs.py:2481
-#: ../src/gui_interface.py:1430
-#: ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:2483
-#: ../src/gui_interface.py:1123
-#: ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Zaproszenie na czat"
 
-#: ../src/dialogs.py:2485
-#: ../src/notify.py:255
-#: ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakt zmienił status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Wiadomość z konta %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Odebrane %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Konsola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 msgid "add"
 msgstr "dodaj"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 msgid "modify"
 msgstr "modyfikuj"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 msgid "remove"
 msgstr "usuń"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, 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> chciałby <b>%(action)s</b> kilka kontaktów w Twoim rosterze."
+msgid ""
+"<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
+"roster."
+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:3003
-#: ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Dodaj"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005
-#: ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Edytuj"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Usuń"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupy"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s zasugerował(a), żebym dodał Cię do rostera."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, python-format
 msgid "Added  %s contacts"
 msgstr "Dodano %s kontaktów"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "Usunięto %s kontaktów"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista prywatności <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista prywatności dla %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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"
+msgstr ""
+"Kolejność: %(order)s, akcja: %(action)s, typ: %(type)s, wartość: %(value)s"
 
-#: ../src/dialogs.py:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Kolejność: %(order)s, akcja: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Edytuj regułę</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj regułę</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Listy prywatności dla %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Listy prywatności"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Niepoprawna nazwa listy"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Musisz podać nazwę nowej listy prywatności."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Jestes zaproszony do rozmowy grupowej"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact zaprasza cię do rozmowy"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Czy chcesz zaakceptować zaproszenie?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:3740
-#: ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Gdy %s ma status:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodaję specjalne powiadomienia dla %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "Nr"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Warunek"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "kiedy mam "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6803,209 +7189,231 @@ msgstr ""
 "\n"
 "This session's Short Authentication String is <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Już zweryfikowałeś tożsamość tego kontaktu."
 
-#: ../src/dialogs.py:4551
-#: ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Tożsamość rozmówcy zweryfikowana"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Ponowna weryfikacja..."
 
-#: ../src/dialogs.py:4564
-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 "Aby być pewnym, że <b>tylko</b> oczekiwane osoby będą mogły czytać twoje wiadomości lub wysyłać wiadomości do ciebie, powinieneś zweryfikować ich tożsamość poprzez kliknięcie przycisku poniżej."
+#: ../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."
+msgstr ""
+"Aby być pewnym, że <b>tylko</b> oczekiwane osoby będą mogły czytać twoje "
+"wiadomości lub wysyłać wiadomości do ciebie, powinieneś zweryfikować ich "
+"tożsamość poprzez kliknięcie przycisku poniżej."
 
-#: ../src/dialogs.py:4567
-#: ../src/dialogs.py:4621
-#: ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Tożsamość rozmówcy NIE zweryfikowana"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Weryfikowanie..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Czy zweryfikowałeś/zweryfikowałaś tożsamość zdalnego rozmówcy?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, 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 ""
-"Aby uniemożliwić rozmowę z nieznaną osobą, powinieneś porozmawiać z <b>%(jid)s</b> bezpośrednio(np. przez telefon) i zweryfikować jej tożsamość, ta osoba zobaczy ten sam Short Authentication String (SAS) jak ty.\n"
+"Aby uniemożliwić rozmowę z nieznaną osobą, powinieneś porozmawiać z <b>%(jid)"
+"s</b> bezpośrednio(np. przez telefon) i zweryfikować jej tożsamość, ta osoba "
+"zobaczy ten sam Short Authentication String (SAS) jak ty.\n"
 "Tej sesji Short Authentication String to <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 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:4622
+#: ../src/dialogs.py:4809
 #, 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."
+msgstr ""
+"Klucz kontaktu (%s) <b>nie pasuje</b> do klucza przypisanego w Gajimie."
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
-msgstr "Nie ma klucza GPG przypisanego do tego kontaktu. Więc nie możesz szyfrować wiadomości do niego, używając GPG."
+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:4635
-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 "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: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."
+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:4641
-msgid "GPG 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:4828
+msgid ""
+"GPG 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:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr "wideo-głosową"
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr "głosową"
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr "wideo"
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, 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 rozpocząć z Tobą rozmowę %(type)s. Chcesz odebrać?"
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Inni"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Konferencja"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 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:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Przeglądanie usług przy użyciu konta %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Nie można odnaleźć usługi"
 
-#: ../src/disco.py:707
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź adres i spróbuj ponownie."
+#: ../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."
+msgstr ""
+"Pod wpisanym adresem nie ma żadnych usług lub one nie odpowiadają. Sprawdź "
+"adres i spróbuj ponownie."
 
-#: ../src/disco.py:711
-#: ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Tej usługi nie można przeglądać"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751
-#: ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Niepoprawna nazwa serwera"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Przeglądanie %(address)s przy użyciu konta %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "Prze_glądaj"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 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:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Wykonaj komendę"
 
-#: ../src/disco.py:1298
-#: ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skanowanie %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781
-#: ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "Dodaj _zakładkę dla tego pokoju"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Zakładka została już dodana"
 
-#: ../src/disco.py:1782
-#: ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
 
-#: ../src/disco.py:1791
-#: ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Zakładka została dodana"
 
-#: ../src/disco.py:1792
-#: ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Zasubskrybowano"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Węzeł"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Nowy wpis"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Cofnij autoryzację"
 
@@ -7014,11 +7422,13 @@ msgid "SSL certificat validation"
 msgstr "Sprawdzanie certyfikatu SSL"
 
 #: ../src/features_window.py:49
-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."
+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:50
-#: ../src/features_window.py:51
+#: ../src/features_window.py:50 ../src/features_window.py:51
 msgid "Requires python-pyopenssl."
 msgstr "Wymaga python-pyopenssl"
 
@@ -7028,7 +7438,9 @@ msgstr "Bonjour / Zeroconf"
 
 #: ../src/features_window.py:53
 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."
+msgstr ""
+"Rozmowy w sieci lokalnej, bez pośrednictwa serwera i z automatycznym "
+"wykrywaniem klientów."
 
 #: ../src/features_window.py:54
 msgid "Requires python-avahi."
@@ -7050,14 +7462,10 @@ msgstr "Skrypt pozwalający na sterowanie Gajimem z linii poleceń."
 msgid "Requires python-dbus."
 msgstr "Wymaga python-dbus"
 
-#: ../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:111
+#: ../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
 msgid "Feature not available under Windows."
 msgstr "Funkcjonalność niedostępna dla systemu Windows."
 
@@ -7091,7 +7499,9 @@ msgstr "Zarządzanie sesją"
 
 #: ../src/features_window.py:69
 msgid "Gajim session is stored on logout and restored on login."
-msgstr "Sesja jest zapisywana przy wylogowaniu z serwera i przywracana przy logowaniu."
+msgstr ""
+"Sesja jest zapisywana przy wylogowaniu z serwera i przywracana przy "
+"logowaniu."
 
 #: ../src/features_window.py:70
 msgid "Requires python-gnome2."
@@ -7146,8 +7556,11 @@ msgid "Passive popups notifying for new events."
 msgstr "Wyświetla okna informujące o nowych zdarzeniach."
 
 #: ../src/features_window.py:86
-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."
+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:88
 msgid "Automatic status"
@@ -7155,7 +7568,8 @@ msgstr "Automatyczny status"
 
 #: ../src/features_window.py:89
 msgid "Ability to measure idle time, in order to set auto status."
-msgstr "Umożliwia mierzenie czasu bezczynności i odpowiednie ustawienie statusu."
+msgstr ""
+"Umożliwia mierzenie czasu bezczynności i odpowiednie ustawienie statusu."
 
 #: ../src/features_window.py:90
 msgid "Requires libxss library."
@@ -7174,12 +7588,20 @@ msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Przekształcanie wyrażeń jezyka LaTeX pomiędzy $$ $$."
 
 #: ../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 "Wymaga texlive-latex-base, dvipng. Musisz ustawić zmienną 'use_latex' na 'True'  w Zaawansowanym Edytorze Ustawień."
+msgid ""
+"Requires texlive-latex-base and dvipng. 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: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 "Wymaga texlive-latex-base, dvipng (Wszystko jest w MikTeX). Musisz ustawić zmienną 'use_latex' na 'True' w Zaawansowanym Edytorze Ustawień."
+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 ""
+"Wymaga texlive-latex-base, dvipng (Wszystko jest w MikTeX). Musisz ustawić "
+"zmienną 'use_latex' na 'True' w Zaawansowanym Edytorze Ustawień."
 
 #: ../src/features_window.py:96
 msgid "End to End message encryption"
@@ -7189,8 +7611,7 @@ msgstr "Szyfrowanie typu \"end to end\""
 msgid "Encrypting chat messages."
 msgstr "Szyfrowanie wysyłanych wiadomości."
 
-#: ../src/features_window.py:98
-#: ../src/features_window.py:99
+#: ../src/features_window.py:98 ../src/features_window.py:99
 msgid "Requires python-crypto."
 msgstr "Wymaga python-crypto."
 
@@ -7199,116 +7620,100 @@ msgid "RST Generator"
 msgstr "Generator RST"
 
 #: ../src/features_window.py:101
-msgid "Generate XHTML output from RST code (see http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html)."
-msgstr "Tworzy XHTML z kodu RST (patrz 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 ""
+"Tworzy XHTML z kodu RST (patrz http://docutils.sourceforge.net/docs/ref/rst/"
+"restructuredtext.html)."
 
-#: ../src/features_window.py:102
-#: ../src/features_window.py:103
+#: ../src/features_window.py:102 ../src/features_window.py:103
 msgid "Requires python-docutils."
 msgstr "Wymaga python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Banery i klikalne linki"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr "Dodaje możliwość wyświetlania aktywnych ('klikalnych') adresów URL."
-
-#: ../src/features_window.py:106
-#: ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Wymaga python-sexy"
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr "Można rozpocząć rozmowę głosową i wideo."
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr "Wymaga python-farsight."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Możliwości"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Plik"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Czas"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Postęp"
 
-#: ../src/filetransfers_window.py:177
-#: ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../src/filetransfers_window.py:178
-#: ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187
-#: ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Ty"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: ../src/filetransfers_window.py:189
-#: ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Zapisane w: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku"
 
-#: ../src/filetransfers_window.py:217
-#: ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Otwórz katalog zawierający ten plik"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Przesyłanie pliku anulowane"
 
-#: ../src/filetransfers_window.py:217
-#: ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Odbiorca: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Komunikat błędu: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
@@ -7316,8 +7721,7 @@ msgstr "Przesyłanie pliku zatrzymane"
 msgid "Choose File to Send..."
 msgstr "Wybierz plik do wysłania..."
 
-#: ../src/filetransfers_window.py:273
-#: ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Opis: "
 
@@ -7349,37 +7753,34 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:342
-#: ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Nie można nadpisać pliku \"%s\""
 
-#: ../src/filetransfers_window.py:343
-#: ../src/gtkgui_helpers.py:860
-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:343 ../src/gtkgui_helpers.py:903
+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:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Ten plik już istnieje"
 
-#: ../src/filetransfers_window.py:359
-#: ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, 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:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Nie masz uprawnień do tworzenia plików w tym folderze."
 
@@ -7403,8 +7804,7 @@ msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: ../src/filetransfers_window.py:585
-#: ../src/filetransfers_window.py:588
+#: ../src/filetransfers_window.py:585 ../src/filetransfers_window.py:588
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
@@ -7416,77 +7816,74 @@ msgstr "Plik: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:615
-#: ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Kontynuuj"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim wymaga do działania serwera X. Zamykanie programu..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
-msgstr "Gajim wymaga PyGTK w wersji 2.12 lub wyższej"
-
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
-msgstr "Gajim wymaga do działania PyGTK w wersji 2.12 lub wyższej. Zamykanie programu..."
-
 #: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
-msgstr "Gajim wymaga GTK w wersji 2.12 lub wyższej"
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
+msgstr "Gajim wymaga PyGTK w wersji 2.12 lub wyższej"
 
 #: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
-msgstr "Gajim wymaga do działania GTK w wersji 2.12 lub wyższej. Zamykanie programu..."
-
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "W GTK+ brakuje wsparcia dla libglade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
+msgstr ""
+"Gajim wymaga do działania PyGTK w wersji 2.12 lub wyższej. Zamykanie "
+"programu..."
 
-#: ../src/gajim.py:193
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla libglade."
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
+msgstr "Gajim wymaga GTK w wersji 2.12 lub wyższej"
 
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim wymaga do działania PySQLite2"
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
+msgstr ""
+"Gajim wymaga do działania GTK w wersji 2.12 lub wyższej. Zamykanie "
+"programu..."
 
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim wymaga do działania pakietu pywin32"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, 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"
+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:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim jest już uruchomiony"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7516,24 +7913,21 @@ msgid "Pops up a window with the next pending event"
 msgstr "Pokazuje okno z następną nieprzeczytaną wiadomością"
 
 #: ../src/gajim-remote.py:93
-msgid "Prints a list of all contacts in the roster. Each contact appears on a separate line"
-msgstr "Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w osobnej linii"
-
-#: ../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:271
-#: ../src/gajim-remote.py:282
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appears on a "
+"separate line"
+msgstr ""
+"Wyświetla listę wszystkich kontaktów. Każdy kontakt zostanie wyświetlony w "
+"osobnej linii"
+
+#: ../src/gajim-remote.py:96 ../src/gajim-remote.py:111
+#: ../src/gajim-remote.py:121 ../src/gajim-remote.py:131
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:170 ../src/gajim-remote.py:191
+#: ../src/gajim-remote.py:221 ../src/gajim-remote.py:230
+#: ../src/gajim-remote.py:237 ../src/gajim-remote.py:244
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "konto"
 
@@ -7555,15 +7949,17 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-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 ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
+msgstr ""
+"jeden z: rozłączony, dostępny, chętny do rozmowy, zaraz wracam, nieobecny, "
+"zajęty, niewidoczny "
 
-#: ../src/gajim-remote.py:110
-#: ../src/gajim-remote.py:133
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169
-#: ../src/gajim-remote.py:273
+#: ../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ść"
 
@@ -7572,8 +7968,13 @@ msgid "status message"
 msgstr "informacja o statusie"
 
 #: ../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 "zmień status konta \"konto\". Jeśli nie jest on określony, to spróbuj zmienić status wszystkich kont, które mają ustawioną opcję synchronizacji ze statusem globalnym"
+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 ""
+"zmień status konta \"konto\". 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:117
 msgid "Changes the priority of account or accounts"
@@ -7588,8 +7989,13 @@ 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"
+msgid ""
+"change the priority of the given account. If not specified, change status of "
+"all accounts that have \"sync with global status\" option set"
+msgstr ""
+"zmień status podanego konta. Jeśli nie jest on określony, to spróbuj zmienić "
+"status wszystkich kont, które mają ustawioną opcję synchronizacji ze "
+"statusem globalnym"
 
 #: ../src/gajim-remote.py:127
 msgid "Shows the chat dialog so that you can send messages to a contact"
@@ -7599,49 +8005,57 @@ msgstr "Pokazuje okno dialogowe umożliwiające wysłanie wiadomości do kontakt
 msgid "JID of the contact that you want to chat with"
 msgstr "JID osoby, z którą chcesz porozmawiać"
 
-#: ../src/gajim-remote.py:131
-#: ../src/gajim-remote.py:221
+#: ../src/gajim-remote.py:131 ../src/gajim-remote.py:221
 msgid "if specified, contact is taken from the contact list of this account"
-msgstr "jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
+msgstr ""
+"jeśli jest podany, to kontakt jest pobierany z listy kontaktów tego konta"
 
 #: ../src/gajim-remote.py:134
 msgid "message content. The account must be specified or \"\""
 msgstr ""
 
 #: ../src/gajim-remote.py:139
-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 "Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', to ustaw 'klucz OpenPGP' na ''."
+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 ""
+"Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto "
+"nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
+"to ustaw 'klucz OpenPGP' na ''."
 
-#: ../src/gajim-remote.py:143
-#: ../src/gajim-remote.py:156
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:156
 msgid "JID of the contact that will receive the message"
 msgstr "JID osoby, która otrzyma wiadomość"
 
-#: ../src/gajim-remote.py:144
-#: ../src/gajim-remote.py:158
+#: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
 #: ../src/gajim-remote.py:169
 msgid "message contents"
 msgstr "zawartość wiadomości"
 
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "pgp key"
 msgstr "klucz pgp"
 
-#: ../src/gajim-remote.py:145
-#: ../src/gajim-remote.py:159
+#: ../src/gajim-remote.py:145 ../src/gajim-remote.py:159
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
+msgstr ""
+"jeśli jest podany, to wiadomość zostanie zaszyfrowana tym kluczem publicznym"
 
-#: ../src/gajim-remote.py:147
-#: ../src/gajim-remote.py:161
+#: ../src/gajim-remote.py:147 ../src/gajim-remote.py:161
 #: ../src/gajim-remote.py:170
 msgid "if specified, the message will be sent using this account"
 msgstr "jeśli jest podane, to wiadomość zostanie wysłana z tego konta"
 
 #: ../src/gajim-remote.py:152
-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 "Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', to ustaw 'klucz OpenPGP' na ''."
+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 ""
+"Wysyła nową wiadomość do kontaktu z listy. Zarówno klucz OpenPGP jak i konto "
+"nie są wymagane. Jeśli chcesz ustawić jedynie 'konto' bez 'klucza OpenPGP', "
+"to ustaw 'klucz OpenPGP' na ''."
 
 #: ../src/gajim-remote.py:157
 msgid "subject"
@@ -7663,10 +8077,8 @@ msgstr "JID pokoju, do którego zostanie wysłana wiadomość"
 msgid "Gets detailed info on a contact"
 msgstr "Pobiera szczegółowe informacje o kontakcie"
 
-#: ../src/gajim-remote.py:177
-#: ../src/gajim-remote.py:190
-#: ../src/gajim-remote.py:220
-#: ../src/gajim-remote.py:229
+#: ../src/gajim-remote.py:177 ../src/gajim-remote.py:190
+#: ../src/gajim-remote.py:220 ../src/gajim-remote.py:229
 msgid "JID of the contact"
 msgstr "JID kontaktu"
 
@@ -7747,7 +8159,8 @@ 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.py:242
-msgid "Returns current status message (the global one unless account is specified)"
+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:249
@@ -7771,74 +8184,97 @@ msgid "XML to send"
 msgstr "XML do wysłania"
 
 #: ../src/gajim-remote.py:262
-msgid "Account in which the xml will be sent; if not specified, xml will be sent to all accounts"
-msgstr "Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle dane do wszystkich kont"
+msgid ""
+"Account in which the xml will be sent; if not specified, xml will be sent to "
+"all accounts"
+msgstr ""
+"Konto, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle "
+"dane do wszystkich kont"
 
 #: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "Zmień status"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Picture to use"
+msgstr "Nick"
+
+#: ../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, na jaki zostanie wysłany XML. Jeżeli nie jest określone, Gajim wyśle "
+"dane do wszystkich kont"
+
+#: ../src/gajim-remote.py:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Obsługuj URI xmpp:/"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI do obsługi"
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Treść wiadomości"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Dołącz do nowego pokoju"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "pokój"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Pokój:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "nick"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Nick"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "hasło"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Hasło do pokoju"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Proszę sprawdzić czy Gajim jest uruchomiony."
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Pokazuje lub ukrywa okno iptyhon"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -7847,15 +8283,15 @@ msgstr ""
 "'%s' nie znajduje się na twojej liście kontaktów.\n"
 "Podaj konto, na które ma zostać wysłana ta wiadomość."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Żadne z twoich kont nie jest aktywne"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Gajim nie jest uruchomiony, nie możesz więc użyć gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -7864,16 +8300,16 @@ msgstr ""
 "Użyto: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumenty:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "Nie znaleziono %s"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -7882,7 +8318,7 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -7891,7 +8327,7 @@ msgstr ""
 "Za dużo argumentów. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -7900,7 +8336,11 @@ msgstr ""
 "Argument \"%(arg)s\" nie jest określony. \n"
 "Wpisz \"%(basename)s help %(command)s\" aby uzyskać więcej informacji"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Błędny adres URI"
 
@@ -7929,182 +8369,179 @@ msgstr "Nie możesz skasować obecnie używanego motywu"
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 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:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Wstaw pseudonim"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Rozmowa z"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Kontynuacja rozmowy"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228
-#: ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Każdy uczestnik może zobaczyć twój pełny JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Zapisywanie rozmów prowadzonych w pokoju jest włączone"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Został utworzony nowy pokój"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
-msgstr "Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
+msgstr ""
+"Serwer przypisał ci lub zmodyfikował twój pseudonim używany w tym pokoju"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272
-#: ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_control.py:1288
-#: ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326
-#: ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "afiliacja została zmieniona "
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "konfiguracja pokoju zmieniona na 'tylko dla członków'"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "zamknięcie systemu"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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"
+msgstr ""
+"** Grupa użytkownika %(nick)s została ustawiona na %(affiliation)s przez %"
+"(actor)s"
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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"
+msgstr ""
+"** Uprawnienia użytkownika %(nick)s zostały zmieniona na %(role)s przez %"
+"(actor)s"
 
-#: ../src/groupchat_control.py:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s dołączył do pokoju"
 
-#: ../src/groupchat_control.py:1473
-#: ../src/gui_interface.py:919
-#: ../src/history_window.py:442
-#: ../src/notify.py:250
+#: ../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 ma teraz status %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
-msgid "If you close this window, you will be disconnected from this group chat."
+#: ../src/groupchat_control.py:1690
+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:1712
-#: ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940
-#: ../src/gui_interface.py:1975
-#: ../src/message_window.py:227
-#: ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301
-#: ../src/roster_window.py:3990
+#: ../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 "_Nie pytaj mnie o to ponownie"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Zmiana tematu"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Wpisz nowy temat:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Zmiana pseudonimu"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Usuwam pokój %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8112,23 +8549,22 @@ msgstr ""
 "Zamierzasz całkowicie usunąć ten pokój. \n"
 "Poniżej możesz podać powód swojej decyzji:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Możesz również podać alternatywne miejsce spotkań:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_control.py:1968
-#: ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynę:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -8138,130 +8574,134 @@ msgid "A programming error has been detected"
 msgstr "Wykryto błąd programistyczny"
 
 #: ../src/gtkexcepthook.py:47
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Nie jest prawdopodnie krytyczny, ale powinien zostać mimo to zgłoszony deweloperom."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Nie jest prawdopodnie krytyczny, ale powinien zostać mimo to zgłoszony "
+"deweloperom."
 
 #: ../src/gtkexcepthook.py:54
 msgid "_Report Bug"
 msgstr "_Zgłoś Błąd"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Szczegóły"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171
-#: ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Błąd odczytu pliku:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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ć"
+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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie jest domyślnym klinetem Jabbera"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 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:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Rozszerzenie nie jest obsługiwane"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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?"
+msgstr ""
+"Obraz nie może zostać zapisany w formacie %(type)s. Zapisać jako %"
+"(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, 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 ""
-"Pożądany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś innego w pokoju %s.\n"
+"Pożądany przez ciebie pseudonim jest używany lub zarejestrowany przez kogoś "
+"innego w pokoju %s.\n"
 "Podaj inny pseudonim:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "W przypadku konfliktu zawsze używaj tego pseudonimu"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Czy akceptujesz tę prośbę na koncie %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autoryzacja HTTP (%(method)s) dla %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205
-#: ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Połączenie nie powiodło się"
 
-#: ../src/gui_interface.py:544
-#: ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558
-#: ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "błąd przy wysyłaniu %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599
-#: ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Prośba o autoryzację"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnął Ci autoryzację"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8269,94 +8709,106 @@ msgstr ""
 "Zawsze będziesz widział ten kontakt jako rozłączony.\n"
 "Czy chcesz go usunąć z listy kontaktów?"
 
-#: ../src/gui_interface.py:663
-#: ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Cofnij autoryzację"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s ustawił temat na %(subject)s"
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Lista zawiera teraz niedostępnych uczestników"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "lista nie zawiera teraz niedostępnych użytkowników"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr "Nastąpiła zmiana konfiguracji pokoju (nie powiązana z prywatnością)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz włączone"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Logowanie rozmów prowadzonych w pokoju jest teraz wyłączone"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Pokój nie jest już anonimowy"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Pokój jest teraz quasi-anonimowy"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Pokój jest teraz w pełni anonimowy"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
-msgid "You configured Gajim to use GPG agent, but there is no GPG 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:1164
+msgid ""
+"You configured Gajim to use GPG agent, but there is no GPG 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:1139
-#: ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Niepoprawne hasło OpenPGP"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG nie jest zaufany"
 
-#: ../src/gui_interface.py:1170
-msgid "The GPG 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:1198
+msgid ""
+"The GPG 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:1182
-msgid "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment variable probably not \t\t\t\tcorrectly 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:1210
+#, fuzzy
+msgid ""
+"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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nowa poczta w skrzynce %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8364,7 +8816,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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8379,44 +8831,42 @@ msgstr ""
 "Temat: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: ../src/gui_interface.py:1417
-#: ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Druga strona przerwała transfer"
 
-#: ../src/gui_interface.py:1419
-#: ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Błąd odczytu pliku"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8425,236 +8875,278 @@ msgstr ""
 "Nie można odszyfrować wiadomości od %s\n"
 "To mogło być sfałszowane."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Nie można odszyfrować wiadomości"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Konflikt nazw użytkownika"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Podaj nazwę użytkownika dla nowego konta lokalnego"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Błąd."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Konflikt zasobów"
 
-#: ../src/gui_interface.py:1722
-msgid "You are already connected to this account with the same resource. Please type a new one"
-msgstr "Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę podać nowy zasób"
+#: ../src/gui_interface.py:1753
+msgid ""
+"You are already connected to this account with the same resource. Please "
+"type a new one"
+msgstr ""
+"Jesteś już połączony z tym kontem przy użyciu tego samego zasobu.Proszę "
+"podać nowy zasób"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce rozpocząć rozmowę głosową."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 msgid "Voice Chat Request"
 msgstr "Prośba o rozmowę głosową"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Błąd podczas weryfikacji certyfikatu SSL"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, 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 ""
-"Wystąpił błąd podczas weryfikowania certyfikatu SSL twojego serwera: %(error)s\n"
+"Wystąpił błąd podczas weryfikowania certyfikatu SSL twojego serwera: %(error)"
+"s\n"
 "Czy ciagle chcesz się połączyć z serwerem?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignoruj komunikat o tym błędzie."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Błąd certyfikatu SSL"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, 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 ""
-"Certyfikat SSL konta %(account)s uległ zmianie lub połączenie to jest podsłuchiwane.\n"
+"Certyfikat SSL konta %(account)s uległ zmianie lub połączenie to jest "
+"podsłuchiwane.\n"
 "Poprzedni odcisk klucza: %(old)s\n"
 "Nowy odcisk klucza: %(new)s\n"
 "\n"
 "Czy nadal chcesz połączyć się i zaktualizować odcisk klucza certyfikatu?"
 
-#: ../src/gui_interface.py:1936
-#: ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Niezabezpieczone połączenie"
 
-#: ../src/gui_interface.py:1937
-msgid "You are about to send your password on an unencrypted connection. Are you sure you want to do that?"
-msgstr "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie.Czy jesteś pewien?"
+#: ../src/gui_interface.py:1970
+#, 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 wysłać hasło wykorzystując niezabezpieczone połączenie. "
+"Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
 
-#: ../src/gui_interface.py:1939
-#: ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Tak, na prawdę chce się połączyć w trybie niezaszyfrowanym"
 
-#: ../src/gui_interface.py:1972
-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 "Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
+#: ../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 ""
+"Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie. "
+"Powinieneś zainstalować PyOpenSSL by temu zapobiec. Czy jesteś pewien?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Zamierzasz wysłać hasło wykorzystując niezabezpieczone połączenie.Czy jesteś "
+"pewien?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "Węzeł PEP nie został usunięty"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Węzeł PEP %(node)s nie został usunięty: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547
-#: ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Emotoikony wyłączone"
 
-#: ../src/gui_interface.py:2548
-msgid "Your configured emoticons theme has not been found, so emoticons have been disabled."
-msgstr "Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą wyłączone."
+#: ../src/gui_interface.py:2623
+msgid ""
+"Your configured emoticons theme has not been found, so emoticons have been "
+"disabled."
+msgstr ""
+"Wybrany przez ciebie styl emotikonów nie został znaleziony, emotikony będą "
+"wyłączone."
 
-#: ../src/gui_interface.py:2570
-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 "Ustawiony przez ciebie styl emotikonów nie mógł zostać załadowany. Ty możesz potrzebować aktualizacji  formatu pliku emoticons.file. Aby poznać więcej szczegółów, zobacz http://trac.gajim.org/wiki/Emoticons."
+#: ../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."
+msgstr ""
+"Ustawiony przez ciebie styl emotikonów nie mógł zostać załadowany. Ty możesz "
+"potrzebować aktualizacji  formatu pliku emoticons.file. Aby poznać więcej "
+"szczegółów, zobacz http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2598
-#: ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Wprowadź hasło dla klucza GPG %(keyid)s (konto %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "Klucz GPG stracił ważność"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Twój klucz GPG stracił ważność, zostaniesz połączony z %s bez OpenGPG"
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Błędne hasło"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
-msgstr "Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
+msgstr ""
+"Proszę ponownie wprowadzić swoje hasło GPG lub kliknąć przycisk Anuluj."
 
 #: ../src/gui_menu_builder.py:93
 msgid "_New Group Chat"
 msgstr "_Nowa rozmowa grupowa"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Nie można odnaleźć bazy danych z historią rozmów"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontakty"
 
 #. holds time
-#: ../src/history_manager.py:174
-#: ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Data"
 
 #. holds nickname
-#: ../src/history_manager.py:180
-#: ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. holds message
-#: ../src/history_manager.py:188
-#: ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Wiadomość"
 
-#: ../src/history_manager.py:248
-msgid "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS RUNNING)"
-msgstr "Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ OPCJI GDY GAJIM JEST URUCHOMIONY)"
+#: ../src/history_manager.py:241
+msgid ""
+"Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
+"RUNNING)"
+msgstr ""
+"Czy chcesz wyczyścić bazę danych? (STANOWCZO ODRADZA SIĘ KORZYSTANIE Z TEJ "
+"OPCJI GDY GAJIM JEST URUCHOMIONY)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
-"Normally allocated database size will not be freed, it will just become reusable. If you really want to reduce database filesize, click YES, else click NO.\n"
+"Normally allocated database size will not be freed, it will just become "
+"reusable. If you really want to reduce database filesize, click YES, else "
+"click NO.\n"
 "\n"
 "In case you click YES, please wait..."
 msgstr ""
-"Standardowo baza danych przechowująca logi rozmów nie zminiejsza swojego rozmiaru - usunięte elementy zwalniają po prostu miejsce dla nowych danych. Jeżeli naprawdę chcesz zminejszyć rozmiar bazy danych kliknij TAK, w przeciwnym wypadku wybierz NIE.\n"
+"Standardowo baza danych przechowująca logi rozmów nie zminiejsza swojego "
+"rozmiaru - usunięte elementy zwalniają po prostu miejsce dla nowych danych. "
+"Jeżeli naprawdę chcesz zminejszyć rozmiar bazy danych kliknij TAK, w "
+"przeciwnym wypadku wybierz NIE.\n"
 "\n"
 "Jeżeli kliknąłeś TAK, musisz teraz poczekać..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Przenoszenie logów rozmów..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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] "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:583
-#: ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Skutków tej operacji nie można będzie wycofać."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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ść?"
@@ -8694,36 +9186,35 @@ msgstr "Obecny status: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: ../src/htmltextview.py:513
-#: ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Przekroczono czas ładowania obrazu"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Obraz jest za duży"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Ty zamierzasz zamknąć wszystkie zakładki"
 
-#: ../src/message_window.py:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Rozmowy"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Czaty"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Rozmowy prywatne"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Wiadomości"
 
@@ -8735,22 +9226,22 @@ msgstr "- wiadomości będzie logowanych"
 msgid "- messages will not be logged"
 msgstr "- wiadomości nie będzie logowanych"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmienił status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s połączył(a) się"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s rozłączył(a) się"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
@@ -8775,7 +9266,7 @@ msgstr "Nowa wiadomość od %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nowa wiadomość od %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignoruj"
 
@@ -8783,22 +9274,18 @@ msgstr "Ignoruj"
 msgid "Retrieving profile..."
 msgstr "Pobieranie profilu..."
 
-#: ../src/profile_window.py:110
-#: ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Plik jest pusty"
 
-#: ../src/profile_window.py:113
-#: ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Plik nie istnieje."
 
 #. keep identation
 #. unknown format
-#: ../src/profile_window.py:127
-#: ../src/profile_window.py:143
-#: ../src/roster_window.py:2850
-#: ../src/roster_window.py:2861
+#: ../src/profile_window.py:127 ../src/profile_window.py:143
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Nie można załadować obrazka."
 
@@ -8823,234 +9310,292 @@ msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
 #: ../src/profile_window.py:362
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie później."
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"W czasie publikowanie informacji o tobie wystąpił błąd, spróbuj ponownie "
+"później."
 
-#: ../src/roster_window.py:280
-#: ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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."
+msgstr ""
+"Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
+"status."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, 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:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG nie nadaje się do użycia"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, 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:2148
-#: ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:2149
-#: ../src/roster_window.py:3395
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na pewno chcesz stać się niewidoczny?"
+#: ../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?"
+msgstr ""
+"Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
+"pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "rozsynchronizowany"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Na pewno zamknąć Gajima?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Na pewno chcesz opuścić program?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Zawsze zamykaj Gajima"
 
-#: ../src/roster_window.py:2333
-#: ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Usuwa transfer pliku"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2334
-msgid "Messages will only be available for reading them later if you have history enabled and contact is in your roster."
-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:2403
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled and contact is in your roster."
+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:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Przejrzyj je wszystkie przed usunięciem tego transportu."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:2581
-msgid "You will no longer be able to send and receive messages from contacts using this transport."
-msgstr "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą tego transportu."
+#: ../src/roster_window.py:2655
+msgid ""
+"You will no longer be able to send and receive messages from contacts using "
+"this transport."
+msgstr ""
+"Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
+"tego transportu."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transporty zostaną usunięte"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from these transports: %s"
-msgstr "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą następujących transportów: %s"
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"these transports: %s"
+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:2653
+#: ../src/roster_window.py:2731
 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:2655
-msgid "This contact will see you offline and you will not receive messages he will send you."
-msgstr "Ten kontakt będzie Cię widział jako rozłączonego. Nie otrzymasz też od niego żadnych komunikatów."
+#: ../src/roster_window.py:2733
+msgid ""
+"This contact will see you offline and you will not receive messages he will "
+"send you."
+msgstr ""
+"Ten kontakt będzie Cię widział jako rozłączonego. Nie otrzymasz też od niego "
+"żadnych komunikatów."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Zmień nazwę dla kontaktu"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Wpisz nazwę dla kontaktu %s."
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Zmień nazwę grupy"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Wpisz nową nazwę dla grupy %s."
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Usuń grupę"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, 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:3212
+#: ../src/roster_window.py:3305
 #, 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"
+msgstr ""
+"Ty zamierzasz usunąć \"%(name)s\" (%(jid)s) ze swojej listy kontaktów.\n"
 
-#: ../src/roster_window.py:3217
-msgid "By removing this contact you also remove authorization resulting in him or her always seeing you as offline."
-msgstr "Usuwając kontakt cofniesz mu również autoryzację, co spowoduje, że kontakt będzie zawsze widział Cię jako rozłączonego."
+#: ../src/roster_window.py:3310
+msgid ""
+"By removing this contact you also remove authorization resulting in him or "
+"her always seeing you as offline."
+msgstr ""
+"Usuwając kontakt cofniesz mu również autoryzację, co spowoduje, że kontakt "
+"będzie zawsze widział Cię jako rozłączonego."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Czy chcesz kontynuować?"
 
-#: ../src/roster_window.py:3226
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
-msgstr "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt będzie zawsze widział Cię jako rozłączonego."
+#: ../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."
+msgstr ""
+"Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
+"będzie zawsze widział Cię jako rozłączonego."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakty zostaną usunięte z twojej listy kontaktów"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
 "you also remove authorization resulting in them always seeing you as offline."
 msgstr ""
 "Usuwając kontakty: %s\n"
-"cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny jako rozłączony."
+"cofniesz im również autoryzację, co spowoduje, że będziesz dla nich widoczny "
+"jako rozłączony."
 
-#: ../src/roster_window.py:3295
-msgid "You are about to send a custom status. Are you sure you want to continue?"
+#: ../src/roster_window.py:3390
+#, fuzzy
+msgid ""
+"You are about to send a custom status. Are you sure you want  to continue?"
 msgstr "Chcesz ustawić indywidualny status. Na pewno chcesz kontynuować?"
 
-#: ../src/roster_window.py:3297
+#: ../src/roster_window.py:3392
 #, python-format
-msgid "This contact will temporarily see you as %(status)s, but only until you change your status. Then he 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:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Twój serwer uniemożliwia przechowywanie metakontaktów"
 
-#: ../src/roster_window.py:3899
-msgid "Your server does not support storing metacontacts information. So those 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:4022
+msgid ""
+"Your server does not support storing metacontacts information. So those "
+"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:3984
-msgid "You are about to create a metacontact. Are you sure you want to continue?"
+#: ../src/roster_window.py:4114
+msgid ""
+"You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Chcesz utworzyć metakontakt. Kontynuować?"
 
-#: ../src/roster_window.py:3986
-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 są sposobem na zgrupowanie kilku kontaktów w jednej linii 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: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."
+msgstr ""
+"Metakontakty są sposobem na zgrupowanie kilku kontaktów w jednej linii "
+"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:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Niepoprawny adres pliku:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9058,12 +9603,12 @@ msgstr[0] "Czy chcesz wysłać ten plik do %s:"
 msgstr[1] "Czy chcesz wysłać te pliki do %s:"
 msgstr[2] "Czy chcesz wysłać te pliki do %s:"
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Wyślij %s do %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Przekształć %s oraz %s w metakontakty"
@@ -9073,132 +9618,130 @@ msgstr "Przekształć %s oraz %s w metakontakty"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718
-#: ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798
-#: ../src/statusicon.py:248
-#: ../src/statusicon.py:295
-#: ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:4847
-#: ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Zarządzaj zakładkami..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:4963
-#: ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Zmień opis statusu"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "_Publikuj Utwór"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Publikuj Utwór"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Konfiguruj Usługi..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maksymalizuj wszystkie"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153
-#: ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "_Wyślij wiadomość grupową"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Do wszystkich użytkowników"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Do wszystkich połączonych użytkowników"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Zarządzaj kontaktami"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Wyślij wiadomość"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Wykonaj komendę..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Zarządzaj transportami"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Modyfikuj transport"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maksymalizuj"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Połącz ponownie"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Rozłącz"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Historia rozmów"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Dołącz do pokoju"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Zmień opis statusu..."
 
@@ -9206,14 +9749,12 @@ msgstr "Zmień opis statusu..."
 msgid "Waiting for results"
 msgstr "Oczekiwanie na wyniki"
 
-#: ../src/search_window.py:132
-#: ../src/search_window.py:210
+#: ../src/search_window.py:132 ../src/search_window.py:210
 msgid "Error in received dataform"
 msgstr "Błąd w odebranych danych"
 
 #. No result
-#: ../src/search_window.py:166
-#: ../src/search_window.py:202
+#: ../src/search_window.py:166 ../src/search_window.py:202
 msgid "No result"
 msgstr "Brak wyników"
 
@@ -9226,21 +9767,21 @@ msgstr "Błąd zapisu na dysk"
 msgid "Subject: %s"
 msgstr "Temat: %s"
 
-#: ../src/session.py:429
-#: ../src/session.py:464
+#: ../src/session.py:429 ../src/session.py:464
 msgid "Confirm these session options"
 msgstr "Potwierdź opcje sesji"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
-"Zdalny klient chce przeprowadzić negocjację sesji z poniższymi ustawieniami:\n"
+"Zdalny klient chce przeprowadzić negocjację sesji z poniższymi "
+"ustawieniami:\n"
 "\n"
 "\t\t%s\n"
 "\n"
@@ -9261,121 +9802,126 @@ msgstr ""
 "\n"
 "Kontynuować?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Zmień opis statusu..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "w _liście kontaktów"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
-#: ../src/tooltips.py:347
-#: ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:350
-#: ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Zasoby: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [zablokowany]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [zminimalizowany]"
 
-#: ../src/tooltips.py:474
-#: ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Ostatni status %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Połączony"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Rozłączony"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Utwór"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Powiadomienia"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:664
-#: ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:670
-#: ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Ukończony"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?status transferu:wstrzymany"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 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:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9383,114 +9929,500 @@ 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:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Czas: Nieznany"
 
-#: ../src/vcard.py:299
-#: ../src/vcard.py:309
-#: ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Grupy:</b>"
 
-#: ../src/vcard.py:344
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie interesujesz się jego/jej statusem."
+#: ../src/vcard.py:343
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
+"interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:346
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie jest zainteresowana twoim."
+#: ../src/vcard.py:345
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
+"jest zainteresowana twoim."
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
-msgstr "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie jest zainteresowany twoim"
+#: ../src/vcard.py:349
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
+msgstr ""
+"Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
+"jest zainteresowany twoim"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Nie ma oczekujących żądań autoryzacji."
 
-#: ../src/vcard.py:364
-#: ../src/vcard.py:418
-#: ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Dołącz do _pokoju"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Dodaj kontakt..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Wyszukuj usługi"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Wykonaj komendę"
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Modyfikuj konto"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Zdarzenia"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Rozpocznij rozmowę"
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Modyfikacja konta"
+
+#~ 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 ""
+#~ "Zaznaczenie tej opcji spowoduje łączenia na porcie 5223 gdzie większość "
+#~ "serwerów udostępnia usługę SSL. Gajim używa szyfrowania TLS domyślnie, "
+#~ "jeśli tylko serwer daje taką możliwość. Ta opcja wyłącza TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Zmień informacje o sobie..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Nazwa hosta: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Zaznaczanie tej opcji spowoduje przechowywanie hasła w pliku ~/.gajim/"
+#~ "config z prawem do odczytu tylko dla ciebie"
+
+#~ msgid "Port: "
+#~ msgstr "Port: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Serwer Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Zapisz _hasło (nie jest to bezpieczne)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Wysyłaj pakiety podtrzymujące"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Korzystaj z _SSL"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Dostosuj do statusu"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Usuń MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Wyślij wiadomość do serwera..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "otrzymam wiadomość\n"
+#~ "kontakt się rozłączy \n"
+#~ "kontakt zmieni status \n"
+#~ "na czacie pojawi się słowo kluczowe \n"
+#~ "otrzymam wiadomość na czacie \n"
+#~ "pojawi się żądanie przesłania pliku \n"
+#~ "rozpocznie się transfer pliku \n"
+#~ "zakończy się transfer pliku"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontaktu(-ów)\n"
+#~ "grupy(grup)\n"
+#~ "wszystkich"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Dołącz do _pokoju"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopiuj JID/Adres e-mail"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopiuj adres odnośnika"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Otwórz Klienta Poczty"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Otwórz Link w przeglądarce"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Rozpocznij rozmowę"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Konto\n"
+#~ "Grupa\n"
+#~ "Kontakt\n"
+#~ "Banner"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Zmień pseudo_nim..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Zmień _temat..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Konfiguruj _pokój..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Zlikwiduj pokój"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Zarządzaj pokojem"
+
+#~ msgid "Send _File"
+#~ msgstr "Wyślij _plik"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "Dod_aj do listy kontaktów"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Wyślij prywatną wiadomość"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Wpisz JID lub nazwe kontaktu\n"
+#~ "Historia rozmów grupowych\n"
+#~ "Wszystkie historie rozmów"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Zarządzaj kontami"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Dodaje kontakt do listy kontaktów (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Dodaj pokój do zakładek (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Historia wiadomości (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Zmień temat pokoju (Ctrl+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Zmień swoją nazwę (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Zaproś kontakt do rozmowy (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Wyślij plik (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Kliknij by wyświetlić listę emotikon (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Pokaż formatowanie tekstu"
+
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Pokaż menu zaawansowanych funkcji (Alt+D)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Pokaż profil kontaktu (Ctrl+I)"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Przełącz sesję audio"
+
+#~ msgid "Toggle video session"
+#~ msgstr "Przełącz sesję wideo"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Wszystkie stany rozmowy\n"
+#~ "Tylko dotyczące pisania\n"
+#~ "Wyłączone"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Automatyczne wykrywanie przy każdym uruchomieniu Gajima\n"
+#~ "Zawsze używaj domyślnych aplikacji GNOME\n"
+#~ "Zawsze używaj domyślnych aplikacji KDE\n"
+#~ "Zawsze używaj domyślnych aplikacji Xfce\n"
+#~ "Własne"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Oddzielne okno rostera, oddzielne okna czatów\n"
+#~ "Oddzielne okno rostera, wspólne okno rozmów\n"
+#~ "Jedno, wspólne okno dla rostera i rozmów\n"
+#~ "Oddzielne okno rostera, rozmowy grupowane według konta\n"
+#~ "Oddzielne okno rostera, rozmowy grupowane według typu"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Otwórz okno\n"
+#~ "Powiadom mnie o tym\n"
+#~ "Pokaż tylko w rosterze"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "brak\n"
+#~ "obie\n"
+#~ "od\n"
+#~ "do"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Dodaj _kontakt..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "_Możliwości programu"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Przesyłanie plików"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil, _Awatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Konta"
+
+#~ msgid "_Contents"
+#~ msgstr "_Zawartość"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Ustawienia"
+
+#~ msgid "_Quit"
+#~ msgstr "_Zakończ"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Wyślij _wiadomość..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Wyślij _wiadomość"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Pokój"
+
+#~ msgid "Enable"
+#~ msgstr "Włącz"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modyfikuj konto..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Błędna nazwa hosta"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Niepoprawny adres lokalny? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr ""
+#~ "Nie znaleziono biblioteki pysqlite2 (lub python-pysqlite2). Kończenie "
+#~ "pracy programu..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Banery i klikalne linki"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr "Dodaje możliwość wyświetlania aktywnych ('klikalnych') adresów URL."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Wymaga python-sexy"
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "W GTK+ brakuje wsparcia dla libglade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję "
+#~ "z %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Sprawdź, czy GTK+ oraz PyGTK posiadają w twoim systemie wsparcie dla "
+#~ "libglade."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim wymaga do działania PySQLite2"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "Wiadomość _otrzymana:"
+
 #~ msgid "_Outgoing message:"
 #~ msgstr "Wysłana wiadomość :"
 
 #, fuzzy
 #~ 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 ""
 #~ "Nazwa hosta %s, którą określiłeś w opcji ft_add_hosts_to_send jest "
 #~ "niepoprawna, będzie więc ignorowana."
+
 #~ msgid "OpenPGP passphrase was not given"
 #~ msgstr "Nie podano klucza OpenPGP"
+
 #~ msgid ""
 #~ "To continue sending and receiving messages, you will need to reconnect."
 #~ msgstr ""
 #~ "Aby dalej wysyłać i odbierać wiadomości musisz się ponownie połączyć."
+
 #~ msgid ""
 #~ "You are not connected or not visible to others. Your message could not be "
 #~ "sent."
 #~ msgstr ""
 #~ "Nie jesteś połączony, lub masz status 'niewidoczny'. Twoja wiadomość nie "
 #~ "mogła zostać wysłana."
+
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Ta wiadomość jest zaszyfrowana]"
+
 #~ msgid "%i days ago"
 #~ msgstr "%i dni temu"
+
 #~ msgid "Trayicon"
 #~ msgstr "Ikona w obszarze powiadamiania"
+
 #~ msgid "A icon in systemtray reflecting the current presence."
 #~ msgstr "Ikona w obszarze powiadamiania odzwierciedla aktualny status."
+
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compiled trayicon module from Gajim "
 #~ "sources."
 #~ msgstr ""
 #~ "Wymaga python-gnome2-extras lub skompilowanego modułu trayicon ze źródeł "
 #~ "Gajima."
+
 #~ msgid "Requires PyGTK >= 2.10."
 #~ msgstr "Wymaga PyGTK >= 2.10."
+
 #~ msgid "Add Special _Notification"
 #~ msgstr "Dodaj powiadomienia _specjalne"
+
 #~ 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.)"
@@ -9498,18 +10430,25 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Użycie: /%(command)s <działanie> spowoduje wysłanie działania do "
 #~ "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"
+
 #~ msgid "Enable link-local/zeroconf messaging"
 #~ msgstr "Uaktywnij komunikację link-local/zeroconf"
+
 #~ msgid "Nickname not found: %s"
 #~ msgstr "Pseudonim nie został odnaleziony: %s"
+
 #~ msgid "This group chat has no subject"
 #~ msgstr "Ten pokój nie ma tematu"
+
 #~ msgid "Invited %(contact_jid)s to %(room_jid)s."
 #~ msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 
@@ -9526,22 +10465,26 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Użycie: /%s <pseudonim|JID> [powód] banuje JID w pokoju. Pseudonim osoby "
 #~ "może zostać zmieniony o ile nie zawiera \"@\". Jeśli JID jest obecnie w "
 #~ "pokoju, to zostanie z niego wyrzucony. NIE toleruje spacji w pseudonimie."
+
 #~ 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 ""
 #~ "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, "
 #~ "jeśli został podany."
+
 #~ msgid ""
 #~ "Usage: /%s <JID> [reason], invites JID to the current group chat, "
 #~ "optionally providing a reason."
 #~ msgstr ""
 #~ "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 #~ "wyświetlając powód."
+
 #~ msgid ""
 #~ "Usage: /%s <room>@<server>[/nickname], offers to join room@server "
 #~ "optionally using specified nickname."
@@ -9556,20 +10499,25 @@ msgstr " zasób o wysokim priorytecie "
 #~ msgstr ""
 #~ "Użycie: /%s <pseudonim> [powód] usuwa podaną poprzez pseudonim osobę z "
 #~ "pokoju i opcjonalnie wyświetla powód. NIE wspiera spacji w pseudonimie."
+
 #~ msgid ""
 #~ "Usage: /%s <nickname> [message], opens a private message window and sends "
 #~ "message to the occupant specified by nickname."
 #~ msgstr ""
 #~ "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
 #~ "wysyła ją do osoby o takim pseudonimie."
+
 #~ 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 ""
 #~ "Użycie: /%s [temat] wyświetla lub aktualizuje temat aktualnego pokoju."
+
 #~ msgid ""
 #~ "Usage: /%s <message>, sends a message without looking for other commands."
 #~ msgstr ""
@@ -9580,73 +10528,97 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Usage: /%s <nickname>, allow <nickname> to send you messages and private "
 #~ "messages."
 #~ msgstr "Użycie: /%s <pseudonim> zmienia twój pseudonim w aktualnym pokoju."
+
 #~ msgid "B_OSH Port:"
 #~ msgstr "B_OSH Port:"
+
 #~ msgid "Show _roster"
 #~ msgstr "Pokaż _listę kontaktów"
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Zawsze używaj domyślnych apikacji OS X"
-#~ msgid "Custom"
-#~ msgstr "Własne"
+
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Przesyłanie pliku zostało zatrzymane przez drugą osobę"
+
 #~ msgid "Generic"
 #~ msgstr "Ogólne"
+
 #~ msgid "Select the account with which to synchronise"
 #~ msgstr "Wskaż konto, z którym chcesz zsynchronizować kontakty"
+
 #~ msgid ""
 #~ "%(title)s by %(artist)s\n"
 #~ "from %(source)s"
 #~ msgstr "\"%(title)s\" w wykonaniu %(artist)sz %(source)s"
+
 #~ msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 #~ msgstr ""
 #~ "Kliknij by zobaczyć możliwości serwerów jabbera (np. transporty MSN czy "
 #~ "ICQ)"
+
 #~ msgid "Servers Features"
 #~ msgstr "Możliwości serwerów"
+
 #~ msgid "Your JID:"
 #~ msgstr "Twój JID:"
+
 #~ msgid "Name:"
 #~ msgstr "Nazwa:"
+
 #~ msgid "_Host:"
 #~ msgstr "_Host:"
+
 #~ msgid "Modify Account"
 #~ msgstr "Modyfikuj konto"
+
 #~ msgid "Gajim account %s"
 #~ msgstr "Konto Gajim'a %s"
+
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Taki Jabber ID już istnieje!"
+
 #~ msgid "This account is already configured in Gajim."
 #~ msgstr "Konto o takiej nazwie jest już skonfigurowane."
+
 #~ msgid "PyOpenSSL"
 #~ msgstr "PyOpenSSL"
+
 #~ msgid "gajim-remote"
 #~ msgstr "gajim-remote"
+
 #~ msgid "OpenGPG"
 #~ msgstr "OpenGPG"
+
 #~ msgid "gnome-keyring"
 #~ msgstr "Baza kluczy GNOME"
+
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compilation of gtkspell module from "
 #~ "Gajim sources."
 #~ msgstr ""
 #~ "Wymaga python-gnome2-extras lub kompilacji gtkspell ze źródeł Gajima."
+
 #~ msgid "Notification-daemon"
 #~ msgstr "Powiadamianie o zdarzeniach"
+
 #~ msgid "Idle"
 #~ msgstr "Stan bezczynności"
+
 #~ msgid "Requires compilation of the idle module from Gajim sources."
 #~ msgstr "Wymaga kompilacji modułu idle ze źródeł Gajima."
+
 #~ msgid "libsexy"
 #~ msgstr "libsexy"
+
 #~ msgid "Mood"
 #~ msgstr "Nastrój"
+
 #~ msgid "Activity"
 #~ msgstr "Aktywność"
+
 #~ msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 #~ msgstr ""
 #~ "Ani %s nie przesyła swojego klucza OpenPGP, ani Ty nie przypisałeś mu "
 #~ "żadnego klucza"
+
 #~ msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 #~ msgstr ""
 #~ "Nie ma takiego polecenia: /%s (jeśli chcesz je wysłać, poprzedź je "
@@ -9667,28 +10639,38 @@ msgstr " zasób o wysokim priorytecie "
 #, fuzzy
 #~ msgid "Encryption disabled"
 #~ msgstr "Szyfrowanie E2E wyłączone"
+
 #~ msgid ""
 #~ "If checked, Gajim will sort contacts in roster window and groupchats by "
 #~ "their status and not by the shown name"
 #~ msgstr ""
 #~ "Zaznaczenie tej opcji spowoduje posortowanie listy kontaktów według ich "
 #~ "statusu a nie według nazw"
+
 #~ msgid "The username used to identify the Last.fm account."
 #~ msgstr "Nazwa użytkownika serwisu Last.fm."
+
 #~ msgid "Network Manager support not available"
 #~ msgstr "Brak wsparcia dla Network Managera"
+
 #~ msgid "Session Management support not available (missing gnome.ui module)"
 #~ msgstr "Wsparcie dla Menadżera Sesji jest niedostępne (brak modułu gnome.ui"
+
 #~ msgid "E2E encryption enabled"
 #~ msgstr "Szyfrowanie E2E włączone"
+
 #~ msgid "General:"
 #~ msgstr "Ogólne"
+
 #~ msgid "Message:"
 #~ msgstr "Wiadomość"
+
 #~ msgid "Close"
 #~ msgstr "Zamknij"
+
 #~ msgid "_Make message windows compact"
 #~ msgstr "_Spraw, by okna wiadomości były zwarte"
+
 #~ msgid "A_ccounts"
 #~ msgstr "_Konta"
 
@@ -9699,46 +10681,63 @@ msgstr " zasób o wysokim priorytecie "
 #, fuzzy
 #~ msgid "The following message was "
 #~ msgstr "Ta wiadomość została jest zaszyfrowana"
+
 #~ msgid "%s is now %s"
 #~ msgstr "%s ma teraz status %s"
+
 #~ msgid "cold"
 #~ msgstr "Zziębnięty"
+
 #~ msgid "hot"
 #~ msgstr "napalony"
+
 #~ msgid "moody"
 #~ msgstr "markotny"
+
 #~ msgid "working"
 #~ msgstr "pracuję"
+
 #~ msgid "eating"
 #~ msgstr "jem"
+
 #~ msgid "inactive"
 #~ msgstr "nieaktywny"
+
 #~ msgid "walking"
 #~ msgstr "Spaceruję"
+
 #~ msgid "sleeping"
 #~ msgstr "Śpię"
+
 #~ msgid "other"
 #~ msgstr "Inne czynności"
 
 #, fuzzy
 #~ msgid "mood"
 #~ msgstr "markotny"
+
 #~ msgid ""
 #~ "Usage: %s %s %s \n"
 #~ "\t %s"
 #~ msgstr ""
 #~ "Użycie: %s %s %s \n"
 #~ "\t %s"
+
 #~ msgid "%s - %s"
 #~ msgstr "%s - %s"
+
 #~ 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"
+
 #~ msgid "<b>History Viewer</b>"
 #~ msgstr "<b>Przeglądanie historii</b>"
+
 #~ msgid "<b>JID Selection</b>"
 #~ msgstr "<b>Wybór JID-a</b>"
+
 #~ msgid ""
 #~ "Choose the chatlog you want to view. \n"
 #~ "Enter the jid of a groupchat or a contact here. For online accounts you "
@@ -9747,28 +10746,38 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Wybierz katalog, który chcesz przejrzeć. \n"
 #~ "Tu wpisz JID czatu lub kontaktu. Jeżeli kontakt jest online, możesz podać "
 #~ "sam nick."
+
 #~ msgid "in"
 #~ msgstr "w"
+
 #~ msgid "Accept"
 #~ msgstr "Akceptuj"
+
 #~ msgid "Invitation Received"
 #~ msgstr "Zaproszenie Odebrane"
+
 #~ msgid "<b>Publish and Subscribe</b>"
 #~ msgstr "<b>Publikuj i subskrybuj</b>"
+
 #~ msgid "Allow others to see your:"
 #~ msgstr "_Pozwól innym widzieć swój:"
+
 #~ msgid "Receive your contact's:"
 #~ msgstr "Odbieraj powiadomomienia o zmianie:"
+
 #~ msgid "Tune"
 #~ msgstr "Muzyka"
+
 #~ msgid ""
 #~ "\n"
 #~ "From: %(from_address)s"
 #~ msgstr ""
 #~ "\n"
 #~ "Od: %(from_address)s"
+
 #~ msgid "OK to continue with negotiation?"
 #~ msgstr "Czy kontynuować negocjację?"
+
 #~ 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"
@@ -9786,46 +10795,61 @@ msgstr " zasób o wysokim priorytecie "
 #~ "pośrednictwem telefonu i potwierdzić, że jej SAS (Short Authentication "
 #~ "String) jest identyczny z poniższym: %s\n"
 #~ "Czy chcesz kontynuować tą sesję?"
+
 #~ msgid "Yes, I verified the Short Authentication String"
 #~ msgstr "Tak, SAS został zweryfikowany."
+
 #~ msgid ""
 #~ "To continue, Gajim needs to access your stored secrets. Enter your "
 #~ "passphrase"
 #~ msgstr ""
 #~ "Aby kontynuować, Gajim musi uzyskać dostęp do Twoich haseł. Proszę podać "
 #~ "hasło główne"
+
 #~ msgid "Confirm Passphrase"
 #~ msgstr "Potwierdź hasło"
+
 #~ msgid "Enter your new passphrase again for confirmation"
 #~ msgstr "Wpisz ponownie nowe hasło"
+
 #~ msgid "Create Passphrase"
 #~ msgstr "Utwórz hasło"
+
 #~ msgid "Passphrases did not match.\n"
 #~ msgstr "Hasła nie zgadzają się.\n"
+
 #~ msgid "Gajim needs you to create a passphrase to encrypt stored secrets"
 #~ msgstr "Proszę podać hasło główne służące do zaszyfrowania danych poufnych"
+
 #~ msgid "Role:"
 #~ msgstr "Funkcja:"
+
 #~ msgid "Affiliation:"
 #~ msgstr "Afiliacja: "
+
 #~ msgid ""
 #~ "If checked, Gajim can regularly poll a Last.fm account and sends recently "
 #~ "played songs through PEP."
 #~ msgstr ""
 #~ "Po zaznaczeniu tej opcji Gajim będzie wysyłał (via PEP) do serwisu Last."
 #~ "fm informacje o odtwarzanych utworach."
+
 #~ msgid ""
 #~ "When negotiating an encrypted session, should Gajim prefer to use public "
 #~ "keys for identification?"
 #~ msgstr ""
 #~ "Czy podczas negocjowania szyfrowanej sesji Gajim ma kluczy publicznych?"
+
 #~ msgid "Connection to host could not be established"
 #~ msgstr "Nie można ustanowić połączenia z hostem"
+
 #~ msgid ""
 #~ "Connection to host could not be established: Incorrect answer from server."
 #~ msgstr "Nie można ustanowić połączenia z hostem. Nieprawidłowa odpowiedź."
+
 #~ msgid "<b>Format of a line</b>"
 #~ msgstr "<b>Format linii</b>"
+
 #~ msgid ""
 #~ "An example: If you have enabled status message for away, Gajim won't ask "
 #~ "you anymore for a status message when you change your status to away; it "
@@ -9834,6 +10858,7 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Przykład: jeżeli ustawiłeś status opisowy dla stanu 'nieobecny', Gajim "
 #~ "zapamięta go i nie będzie prosił o jego zmianę po ponownym ustawieniu "
 #~ "takiego stanu"
+
 #~ msgid ""
 #~ "Determined by sender\n"
 #~ "Chat message\n"
@@ -9842,10 +10867,13 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Określa nadawca\n"
 #~ "Rozmowę\n"
 #~ "Pojedynczą wiadomość"
+
 #~ msgid "Events"
 #~ msgstr "Zdarzenia"
+
 #~ msgid "Hides buttons in chatwindows to "
 #~ msgstr "Ukrywa przyciski w oknie czatu "
+
 #~ msgid ""
 #~ "Never\n"
 #~ "Always\n"
@@ -9856,18 +10884,25 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Zawsze\n"
 #~ "Według konta\n"
 #~ "Według typu"
+
 #~ msgid "Privacy"
 #~ msgstr "Prywatność"
+
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "Wyświetlaj informacje o odtwarzanej _muzyce w statusie opisowym"
+
 #~ msgid "The auto away status message"
 #~ msgstr "Automatyczny status \"Zaraz wracam\""
+
 #~ msgid "The auto not available status message"
 #~ msgstr "Automatyczny status \"Nieobecny\""
+
 #~ msgid "Treat all incoming messages as:"
 #~ msgstr "Traktuj wszystkie otrzymane wiadomości jako:"
+
 #~ msgid "Use only one message _window:"
 #~ msgstr "_Grupuj okna:"
+
 #~ msgid ""
 #~ "Works for Rhythmbox and Muine players. For more players, please visit "
 #~ "http://trac.gajim.org/wiki/GajimAndMusicPlayer"
@@ -9875,54 +10910,79 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Funkcja ta działa z programami Rhythmbox oraz Muine. Jeżeli zależy ci na "
 #~ "obsłudze innego oprogramowania, odwiedź stronę http://trac.gajim.org/wiki/"
 #~ "GajimAndMusicPlayer"
+
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Edytor zaawansowanych ustawień"
+
 #~ msgid "_Player:"
 #~ msgstr "_Program odtwarzający dźwięk:"
+
 #~ msgid "City:"
 #~ msgstr "Miasto:"
+
 #~ msgid "Company:"
 #~ msgstr "Firma:"
+
 #~ msgid "Country:"
 #~ msgstr "Kraj:"
+
 #~ msgid "Given:"
 #~ msgstr "Imię:"
+
 #~ msgid "Middle:"
 #~ msgstr "Drugie imię:"
+
 #~ msgid "Position:"
 #~ msgstr "Stanowisko:"
+
 #~ msgid "Prefix:"
 #~ msgstr "Prefiks:"
+
 #~ msgid "State:"
 #~ msgstr "Stan/Województwo:"
+
 #~ msgid "Suffix:"
 #~ msgstr "Sufiks:"
+
 #~ msgid "Ask:"
 #~ msgstr "Pytaj:"
+
 #~ msgid "Client:"
 #~ msgstr "Klient:"
+
 #~ msgid "OS:"
 #~ msgstr "System operacyjny:"
+
 #~ msgid "Subscription:"
 #~ msgstr "Autoryzacja:"
+
 #~ msgid "You will always see him or her as offline."
 #~ msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
+
 #~ msgid "%s is now %s (%s)"
 #~ msgstr "%s ma teraz status %s (%s)"
+
 #~ msgid "%s - Gajim"
 #~ msgstr "%s - Gajim"
+
 #~ msgid "_New group chat"
 #~ msgstr "_Nowa rozmowa grupowa"
+
 #~ msgid "_Log off"
 #~ msgstr "R_ozłącz"
+
 #~ msgid "_Log on"
 #~ msgstr "_Połącz"
+
 #~ msgid "Save passphrase"
 #~ msgstr "Zapisz hasło"
+
 #~ msgid "Connected to server %s:%s with %s"
 #~ msgstr "Połączony z serwerem %s: %s z %s"
+
 #~ msgid "Build custom query"
 #~ msgstr "Stwórz własne zapytanie"
+
 #~ msgid ""
 #~ "Enter a contact jid or MUC jid here to view its history.\n"
 #~ "If a contact is connected you can even enter his nick name.\n"
@@ -9930,12 +10990,16 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Wprowadź nazwę użytkownika z rostera lub czatu aby przejrzeć historię "
 #~ "rozmów.\n"
 #~ "Jeżeli jest połączony, możesz podać jego nazwę.\n"
+
 #~ msgid "Query Builder..."
 #~ msgstr "Kreator zapytań..."
+
 #~ msgid "_Discover Services..."
 #~ msgstr "_Wyszukuj usługi..."
+
 #~ msgid "_Retype Password:"
 #~ msgstr "_Powtórz hasło:"
+
 #~ msgid ""
 #~ "If checked, all local contacts that use a Bonjour compatible chat client "
 #~ "(like iChat, Trillian or Gaim) will be shown in roster. You don't need to "
@@ -9947,65 +11011,82 @@ msgstr " zasób o wysokim priorytecie "
 #~ "lokalnej kontakty używające klienta wykorzystującego technologię Bonjour "
 #~ "(jak iChat, Trillian czy Gaim) pojawią się na rosterze. Nie musisz łączyć "
 #~ "się z serwerem Jabbera, by z nimi rozmawiać."
+
 #~ msgid ""
 #~ "If you have 2 or more accounts and this is checked, Gajim will list all "
 #~ "contacts as if you had one account"
 #~ msgstr ""
 #~ "Jeśli masz dwa konta lub więcej, to dzięki tej opcji Gajim pokaże "
 #~ "wszystkie kontakty w taki sposób, jakby było to jedno konto"
+
 #~ msgid "_Enable link-local messaging"
 #~ msgstr "_Uaktywnij przesyłanie wiadomości do adresów link-local"
+
 #~ msgid "_Blocked Contacts"
 #~ msgstr "_Kontakty zablokowane"
+
 #~ msgid "_Compact View    Alt+C"
 #~ msgstr "Widok _zwarty    Alt+C"
+
 #~ msgid "<b>Interface Customization</b>"
 #~ msgstr "<b>Własne ustawienia interfejsu</b>"
+
 #~ msgid "Also known as iChat style"
 #~ msgstr "Znany także jako styl iChat"
+
 #~ msgid "Chat"
 #~ msgstr "Rozmowa"
+
 #~ msgid "E_very 5 minutes"
 #~ msgstr "Co 5 _minut"
+
 #~ msgid ""
 #~ "Gajim will automatically show new events by popping up the relevant window"
 #~ msgstr ""
 #~ "Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej "
 #~ "karcie otwartego okna rozmowy"
+
 #~ msgid ""
 #~ "Gajim will notify you for new events via a popup in the bottom right of "
 #~ "the screen"
 #~ msgstr ""
 #~ "Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
 #~ "prawym dolnym rogu ekranu"
+
 #~ msgid ""
 #~ "Gajim will notify you via a popup window in the bottom right of the "
 #~ "screen about contacts that just signed in"
 #~ msgstr ""
 #~ "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 #~ "kontaktach, które zmieniają status na Dostępny"
+
 #~ msgid ""
 #~ "Gajim will only change the icon of the contact that triggered the new "
 #~ "event"
 #~ msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość"
+
 #~ msgid ""
 #~ "If checked, Gajim will remember the roster and chat window positions in "
 #~ "the screen and the sizes of them next time you run it"
 #~ msgstr ""
 #~ "Zaznaczenie tej opcji spowoduje zapamiętanie położenia głównego okna "
 #~ "programu na ekranie oraz jego rozmiaru"
+
 #~ msgid "On every _message"
 #~ msgstr "W każdej _wiadomości"
+
 #~ msgid "Outgoing Chat state noti_fications:"
 #~ msgstr "Wysyłanie powiadomienia o stanie _rozmowy:"
+
 #~ msgid "Print time:"
 #~ msgstr "Wyświetlaj czas:"
+
 #~ msgid "Save _position and size for roster and chat windows"
 #~ msgstr "Zapisz _pozycję i rozmiar okna kontaktów i okna rozmowy"
-#~ msgid "Show only in _roster"
-#~ msgstr "Pokaż tylko _listę kontaktów"
+
 #~ msgid "Use t_rayicon (aka. notification area icon)"
 #~ msgstr "_Ikona w obszarze powiadamiania"
+
 #~ msgid ""
 #~ "When a new event (message, file transfer request etc..) is received, the "
 #~ "following methods may be used to inform you about it. Please note that "
@@ -10016,20 +11097,19 @@ msgstr " zasób o wysokim priorytecie "
 #~ "itp.), możesz zostać o tym powiadomiony na takie sposoby. UWAGA: Nowa "
 #~ "wiadomość pojawia się jeśli nie pochodzi od osoby, z którą aktualnie "
 #~ "rozmawiasz"
-#~ msgid "_Never"
-#~ msgstr "_Nigdy"
-#~ msgid "_Notify me about it"
-#~ msgstr "Powia_dom mnie o tym"
-#~ msgid "_Pop it up"
-#~ msgstr "_Wyświetl"
+
 #~ msgid "Send cus_tom status"
 #~ msgstr "Wyślij _odrębny status"
+
 #~ msgid "_Remove from Roster"
 #~ msgstr "_Usuń z listy kontaktów"
+
 #~ msgid "_Filter:"
 #~ msgstr "_Filtr:"
+
 #~ msgid "Click to force avatar"
 #~ msgstr "Kliknij aby ustawić avatar"
+
 #~ msgid ""
 #~ "If that is not your language for which you want to highlight misspelled "
 #~ "words, then please set your $LANG as appropriate. Eg. for French do "
@@ -10044,87 +11124,116 @@ msgstr " zasób o wysokim priorytecie "
 #~ "in /etc/profile.\n"
 #~ "\n"
 #~ "Podświedlanie błędów w pisowni nie będzie używane"
+
 #~ msgid "Every %s _minutes"
 #~ msgstr "Co %s _minut"
+
 #~ msgid "You must enter a password for the new account."
 #~ msgstr "Musisz wpisać hasło dla nowego konta."
+
 #~ msgid "Blocked Contacts for %s"
 #~ msgstr "Kontakty zablokowane (dla %s)"
+
 #~ msgid "%s does not appear to be a valid JID"
 #~ msgstr "%s nie wygląda na poprawny JID"
+
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Usuń %s z grupy %s"
+
 #~ msgid "Hides the buttons in two persons chat window."
 #~ msgstr "Ukrywa przyciski podczas rozmowy dwóch osób."
+
 #~ msgid "Security error connecting to \"%s\""
 #~ msgstr "Błąd zabezpieczeń przy połączeniu z \"%s\""
+
 #~ msgid ""
 #~ "The server's key has changed, or someone is trying to hack your "
 #~ "connection."
 #~ msgstr ""
 #~ "Zmienił się klucz twojego serwera lub ktoś próbuje podsłuchać połączenie."
+
 #~ msgid "Unable to check fingerprint for %s. Connection could be insecure."
 #~ msgstr ""
 #~ "Nie można sprawdzić odcisku klucza %s. Połączenie może nie być bezpieczne"
+
 #~ msgid "Missing fingerprint in SSL connection to %s"
 #~ msgstr "Brak odcisku klucza w połączeniu SSL z %s"
+
 #~ msgid "Fingerprint mismatch for %s: Got %s, expected %s"
 #~ msgstr "Niezgodność odcisku klucza %s. Oczekiwano %s, otrzymano %s"
+
 #~ msgid " %d unread single message"
 #~ msgid_plural " %d unread single messages"
 #~ msgstr[0] "%d nieprzeczytana wiadomość"
 #~ msgstr[1] "%d nieprzeczytane wiadomości"
 #~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
 #~ msgid " %d unread group chat message"
 #~ msgid_plural " %d unread group chat messages"
 #~ msgstr[0] "%d nieprzeczytana wiadomość z czatu"
 #~ msgstr[1] "%d nieprzeczytane wiadomości z czatu"
 #~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
 #~ msgid " %d unread private message"
 #~ msgid_plural " %d unread private messages"
 #~ msgstr[0] "%d nieprzeczytana wiadomość prywatna"
 #~ msgstr[1] "%d nieprzeczytane wiadomości prywatne"
 #~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
 #~ msgid "gtk+"
 #~ msgstr "gtk+"
+
 #~ msgid "2003-12-13T18:30:02Z"
 #~ msgstr "2003-12-13T18:30:02Z"
+
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo i Julia</small>"
-#~ msgid "Old stories"
-#~ msgstr "Stare historie"
+
 #~ msgid "Soliloquy"
 #~ msgstr "Monolog"
+
 #~ msgid "Private Chat"
 #~ msgstr "Rozmowa prywatna"
+
 #~ msgid "Group Chat"
 #~ msgstr "Pokój"
+
 #~ msgid "I'm %s"
 #~ msgstr "Jestem %s"
+
 #~ msgid "A_fter nickname:"
 #~ msgstr "_Za pseudonimem:"
+
 #~ msgid "_After time:"
 #~ msgstr "_Po czasie:"
+
 #~ msgid "_Before time:"
 #~ msgstr "P_rzed czasem:"
+
 #~ msgid "_Retrieve"
 #~ msgstr "_Przywróć"
+
 #~ msgid "Information published"
 #~ msgstr "Informacja została opublikowana"
+
 #~ msgid "Without a connection, you can not get your contact information."
 #~ msgstr "Musisz być połączony by uzyskać informacje o kontakcie."
+
 #~ msgid "This is result of query."
 #~ msgstr "Oto wynik zapytania."
+
 #~ msgid "Edit items on the list"
 #~ msgstr "Edytuj obiekty na liście"
-#~ msgid "Receive a Message"
-#~ msgstr "Odbierz wiadomość"
+
 #~ msgid "JID: "
 #~ msgstr "JID: "
+
 #~ msgid "Merge consecutive nickname in chat window."
 #~ msgstr "Łącz następujące po sobie te same nicki w oknie czata."
+
 #~ msgid "Role: "
 #~ msgstr "Funkcja: "
+
 #~ msgid ""
 #~ "Sound to play when any MUC message arrives. (This setting is taken into "
 #~ "account only if notify_on_all_muc_messages is True)"
@@ -10132,35 +11241,48 @@ msgstr " zasób o wysokim priorytecie "
 #~ "Dźwięk, który zostanie odtworzony, gdy nadejdzie wiadomość MUC. (Ta opcja "
 #~ "jest brana pod uwagę jedynie gdy zmienna notify_on_all_muc_messages ma "
 #~ "wartość True)"
+
 #~ msgid "Away "
 #~ msgstr "Zaraz wracam "
+
 #~ msgid "Down"
 #~ msgstr "W dół"
+
 #~ msgid "List of special notifications settings"
 #~ msgstr "Lista akcji dla powiadomień"
+
 #~ msgid "Not Available "
 #~ msgstr "Nieobecny "
+
 #~ msgid "Up"
 #~ msgstr "Do góry"
+
 #~ msgid "Create your own Privacy Lists"
 #~ msgstr "Stwórz własną listę prywatności"
+
 #~ msgid "Server-based Privacy Lists"
 #~ msgstr "Listy prywatności po stronie serwera"
+
 #~ msgid "Contact _Info"
 #~ msgstr "_Informacje o kontakcie"
+
 #~ msgid "Jabber"
 #~ msgstr "Jabber"
+
 #~ msgid "Invalid room or server name"
 #~ msgstr "Niepoprawna nazwa pokoju lub serwera"
+
 #~ msgid "Your personal information has been published successfully."
 #~ msgstr "Informacje o tobie zostały opublikowane."
+
 #~ msgid "Migrating Logs..."
 #~ msgstr "Przenoszenie logów..."
+
 #~ msgid "Gajim - %d unread message"
 #~ msgid_plural "Gajim - %d unread messages"
 #~ msgstr[0] "Gajim - %d nieprzeczytana wiadomość"
 #~ msgstr[1] "Gajim - %d nieprzeczytane wiadomości"
 #~ msgstr[2] "Gajim - %d nieprzeczytane wiadomości"
+
 #~ msgid "Since %s"
 #~ msgstr "Od %s"
-
diff --git a/po/pt.po b/po/pt.po
index 1ebca3cc1..f05f93215 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -15,63 +15,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Cliente Jabber GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "_Entrar num Chat..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Adicionar Contacto"
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Descobrir Recursos"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr ""
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "_Modificar Conta..."
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 #, fuzzy
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir Compositor de Email"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "Detalhes Pessoais..."
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "_Iniciar Conversa"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "E_stado"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -82,84 +31,91 @@ msgstr ""
 "\n"
 "Por favor, aguarde..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor escolha uma das opções abaixo:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, 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/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "Usar autenticação"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Ligar quando eu premir Concluir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Criação Passo-a-passo de uma Conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "Já tenho uma conta e quero usá-la"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Quero _registar uma nova conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Gerir..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Nenhum"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "Proxy:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Guardar _senha"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 #, fuzzy
 msgid "Set my profile when I connect"
 msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Usar hostname/porta personalizados"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -167,157 +123,158 @@ msgstr ""
 "Necessita de uma conta para se poder ligar\n"
 "à rede Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "Avançado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "Nome do Host:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Detalhes Pessoais</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>Registos</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, 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"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Modificação da Conta"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Contas"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "_Administrador"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Usar autenticação"
+
+#: ../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."
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Ligar ao arranque"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "Mu_dar Senha"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Marque esta opção se quiser que o Gajim se ligue usando a porta 5223, onde "
-"se espera que servidores específicos possuem capacidades SSL. Note que o "
-"Gajim usa encriptação TLS por defeito se emitida pelo servidor, e que com "
-"esta opção marcada o TLS será desactivado."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "_Escolha chave..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Clique para mudar a senha da conta"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "_Ligar ao arranque"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Ligação"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Editar Detalhes Pessoais..."
+#: ../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
+#, fuzzy
+msgid "First Name:"
+msgstr "Nome:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Geral"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Nome do Host:"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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 ""
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, 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:26
 #, fuzzy
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
@@ -326,16 +283,7 @@ msgstr ""
 "Se marcado, o Gajim enviará pacotes keep-alive para evitar timeouts da "
 "ligação, os quais resultam na perda dessa ligação"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Se marcado, o Gajim guardará a sua senha em ~/.gajim/config com permissão de "
-"'leitura' apenas para si"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -343,8 +291,7 @@ msgstr ""
 "Se marcado, o Gajim, quando iniciado, ligar-se-á automaticamente ao jabber "
 "usando esta conta"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -353,47 +300,48 @@ 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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Informações sobre si, tal como estão gravadas no servidor"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+#, fuzzy
+msgid "Last Name:"
+msgstr "Nome:"
+
+#: ../data/gui/accounts_window.ui.h:34
+#, fuzzy
+msgid "Mer_ge accounts"
+msgstr "_Fundir contas"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Nenhum"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Porta:"
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -403,23 +351,21 @@ msgstr ""
 "servidor jabber quando dois ou mais clientes estão ligados usando a mesma "
 "conta; O cliente com a maior prioridade receberá os eventos"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Re_nomear"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "Re_curso: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -433,216 +379,102 @@ msgstr ""
 "recursos 'Casa' e 'Trabalho' ao mesmo tempo. O recurso com a maior "
 "prioridade receberá os eventos. (ver em baixo)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Guardar _frase de acesso (inseguro)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Guardar _históricos das conversas para todos os contactos"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "Enviar pacotes keep-alive"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar estado da conta com estado global"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "Mostrar Contactos _Offline"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Usar _SSL (específica)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-#, fuzzy
-msgid "Use file transfer proxies"
-msgstr "lista de transferências de ficheiros"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr ""
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-#, fuzzy
-msgid "_Name:"
-msgstr "_Nome: "
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>Registos</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "Pedir para ver o estado dele/dela"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Contas"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "Usar autenticação"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "_Ligar ao arranque"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Mail:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-#, fuzzy
-msgid "First Name:"
-msgstr "Nome:"
-
-#: ../data/glade/accounts_window.glade.h:24
-#, 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/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-#, fuzzy
-msgid "Last Name:"
-msgstr "Nome:"
-
-#: ../data/glade/accounts_window.glade.h:34
-#, fuzzy
-msgid "Mer_ge accounts"
-msgstr "_Fundir contas"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Re_nomear"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "Enviar pacotes keep-alive"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "Sinc_ronizar estado da conta com estado global"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "Mostrar Contactos _Offline"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "Usar hostname/porta personalizados"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "Usar hostname/porta personalizados"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+#, fuzzy
+msgid "Use file transfer proxies"
+msgstr "lista de transferências de ficheiros"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "Editar Detalhes Pessoais..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "Activar"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "Nome do Host:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "Gerir..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "_Porta:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 #, fuzzy
 msgid "A_ccount:"
 msgstr "Conta:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/gui/add_new_contact_window.ui.h:2
 #, fuzzy
 msgid "A_llow this contact to view my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Adicionar Novo Contacto"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -650,659 +482,723 @@ msgid ""
 "proceed."
 msgstr ""
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 #, fuzzy
 msgid "_Group:"
 msgstr "Grupo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Alcunha:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 #, fuzzy
 msgid "_Protocol:"
 msgstr "Protocolo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 #, fuzzy
 msgid "_Register"
 msgstr "Re_gistar"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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:16
 #, fuzzy
 msgid "_User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../data/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 #, fuzzy
 msgid "<b>An error has occurred:</b>"
 msgstr "Ocorreu um erro de protocolo:"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
 msgid "Error description..."
 msgstr "Descrição"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 #, fuzzy
 msgid "Please wait while retrieving command list..."
 msgstr ""
 "Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
 "feita "
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 #, fuzzy
 msgid "Please wait while the command is sending..."
 msgstr ""
 "Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
 "feita "
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr ""
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Descrição</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr ""
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Editor de Configuração Avançada"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Apagar MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Apaga a Mensagem do Dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "Iniciar Conversa"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr "Envia uma mensagem aos utilizadores ligados ao servidor neste momento"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "Definir MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Define a Mensagem do Dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Mostrar Consola _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "Actualizar MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Actualiza a Mensagem do Dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "E_nviar Mensagem de Servidor"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 #, fuzzy
 msgid "<b>Actions</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 #, fuzzy
 msgid "<b>Conditions</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 #, fuzzy
 msgid "Advanced Actions"
 msgstr "Acções A_vançadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 #, fuzzy
 msgid "Advanced Notifications Control"
 msgstr "Editor de Configuração Avançada"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 #, fuzzy
 msgid "All statuses"
 msgstr "Estado: "
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Ausente"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 #, fuzzy
 msgid "Busy "
 msgstr "Ocupado"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 #, fuzzy
 msgid "Launch a command"
 msgstr "comando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Indisponível"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 #, fuzzy
 msgid "Online / Free For Chat"
 msgstr "Livre para conversar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 #, fuzzy
 msgid "Play a sound"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
+#: ../data/gui/advanced_notifications_window.ui.h:25
+#, fuzzy
+msgid "Receive a Message"
+msgstr "Nova Mensagem Privada"
 
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/gui/advanced_notifications_window.ui.h:26
 msgid "When "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../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/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../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/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 #, fuzzy
 msgid "_Show event in roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 #, fuzzy
 msgid "_Show event in systray"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "Contacto:"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 #, fuzzy
 msgid "for "
 msgstr "Porta:"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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 ""
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
 msgstr "País:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "nome do tema"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
 msgid "Last modified:"
 msgstr "Nome:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "Contacto:"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>Registos</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>Registos</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Mudar Senha"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Introduza novamente para confirmação"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Introduza a nova senha:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "Activo"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "Sala:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 #, fuzzy
 msgid "Preset messages:"
 msgstr "mensagem de estado:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 #, fuzzy
 msgid "Save as Preset..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "_Entrar num Chat"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "_Adicionar à Lista"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Copiar JID/Endereço de Email"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Copiar Localização do Link"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Abrir Compositor de Email"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Abrir Link no Navegador"
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "E_nviar"
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Iniciar Conversa"
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "Invisível"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "Servidor"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../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"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "<b>Notificações Visuais</b>"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "Atribuir chave OpenPGP"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "comando"
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "Editar _Grupos"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "Contacto:"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "_Remover"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 #, fuzzy
 msgid "Send Single _Message..."
 msgstr "Enviar _Mensagem Simples"
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "Enviar _Ficheiro"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Iniciar _Conversa"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "Activar/Desactivar Encriptação Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Activar/Desactivar Encriptação Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "_Adicionar à Lista"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 #, fuzzy
 msgid "_Allow him/her to see my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 #, fuzzy
 msgid "_Forbid him/her to see my status"
 msgstr "Proibí-lo /-la de ver o meu estado"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "Contacto:"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "_Renomear"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Subscrição"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "_Continuar"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 #, fuzzy
 msgid "Fill in the form."
 msgstr "Neste grupo"
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configuração da Sala"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>Descrição</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "Recursos dos Servidores"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Cancelar transferência de ficheiro"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Cancela a transferência de ficheiro seleccionada"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Limpar"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Transferências de Ficheiros"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Esconde a janela"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Remover a transferência de ficheiro da lista."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1310,228 +1206,179 @@ 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/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 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/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Continuar"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Abrir Pasta"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "lista de transferências de ficheiros"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:2
+#: ../data/gui/gajim_themes_window.ui.h:2
 #, fuzzy
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Count\n"
-"Grupo\n"
-"Contacto\n"
-"Banner"
+msgid "Account row"
+msgstr "Conta"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+#, fuzzy
+msgid "Chat Banner"
+msgstr "Faixa:"
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Contacto:"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Estilo da letra:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Personalização de Temas do Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 #, fuzzy
 msgid "Gone"
 msgstr "Nenhum"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 #, fuzzy
 msgid "Inactive"
 msgstr "Activo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 #, fuzzy
 msgid ""
 "MUC\n"
 "Messages"
 msgstr "Mensagem"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
 msgstr ""
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pausada"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Cor do texto"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Letra do texto"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "Cor _de fundo"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "Muda Alcu_nha"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "Muda A_ssunto"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "Configurar _Sala"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-#, fuzzy
-msgid "_Bookmark"
-msgstr "Adicionar esta Sala aos _Bookmarks"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "Gerir Bookmarks"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "Acções de _Ocupantes"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Enviar _Ficheiro"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Adicionar à Lista"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Dono"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "E_nviar Mensagem Privada"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr ""
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 #, fuzzy
 msgid "Subject"
 msgstr "Assunto:"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-#, fuzzy
-msgid "Delete"
-msgstr "Apagar MOTD"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1540,428 +1387,442 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 #, fuzzy
 msgid "_Search Database"
 msgstr "_Pesquisar"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Nome do Contacto"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Chat"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "_Pesquisar"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "Adicionar esta Sala aos _Bookmarks"
+msgid "Bro_wse Rooms"
+msgstr "_Explorar"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/gui/join_groupchat_window.ui.h:4
 #, fuzzy
-msgid "Join this room automatically when I connect"
+msgid "Join this room _automatically when I connect"
 msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Alcunha:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Gerir Contas"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Entrar automaticamente"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gerir Bookmarks"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 #, fuzzy
 msgid "Print status:"
 msgstr "Mostrar hora:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Título:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "Configuração da Sala"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "_Continuar"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "Apagar MOTD"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Propriedades</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Definições</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr "Ligação HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gerir Perfis de Proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "Usar autenticação"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr ""
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+#, fuzzy
+msgid "_Name:"
+msgstr "_Nome: "
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "Nome de _utilizador"
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Adiciona o contacto à lista"
-
-#: ../data/glade/message_window.glade.h:2
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Adicionar esta Sala aos _Bookmarks"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Muda Alcu_nha"
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "está a prestar atenção à conversa"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Clique para inserir um emoticon (Alt+E)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "Clique para inserir um emoticon (Alt+E)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Clique para inserir um emoticon (Alt+E)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "E_nviar"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor de Configuração Avançada</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Aplicações</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Mudanças na última versão</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notificações Visuais</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Sons</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>Registos</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 #, fuzzy
 msgid "<b>GMail Options</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<b>Propriedades</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>Configurar Mensagens de Estado</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>Propriedades</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Formato de uma linha</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificações Visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "Avançado"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Todos os estados da conversa\n"
-"Apenas compondo uma mensagem\n"
-"Desactivado"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Estado: "
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO "
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../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 "
+
+#: ../data/gui/preferences_window.ui.h:28
 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/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Ausente"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Pedir a mensagem de estado quando eu me: "
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Auto-detectar a cada arranque da aplicação\n"
-"Usar sempre aplicações GNOME padrão\n"
-"Usar sempre aplicações KDE padrão\n"
-"Personalizar"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "_Ligar ao arranque"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+msgid "Composing only"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Nome do Contacto"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>Definições Personalizadas</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 #, fuzzy
 msgid "Display a_vatars of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 #, fuzzy
 msgid "Display status _messages of contacts in roster"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../data/gui/preferences_window.ui.h:58
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1971,7 +1832,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../data/gui/preferences_window.ui.h:59
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -1981,7 +1842,7 @@ msgstr ""
 "Gajim pode enviar e receber meta-informação relativa a uma conversa que "
 "esteja a ter com um contacto "
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1989,37 +1850,37 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se desligarem"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 #, fuzzy
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
@@ -2028,7 +1889,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/gui/preferences_window.ui.h:68
 #, fuzzy
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
@@ -2037,7 +1898,7 @@ msgstr ""
 "Se marcado, Gajim exibirá as mensagens de estado dos contactos debaixo dos "
 "nomes de cada um na janela principal"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -2045,7 +1906,15 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -2053,7 +1922,7 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -2061,14 +1930,14 @@ msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2079,20 +1948,20 @@ msgstr ""
 "spammar/incomodar. Use com precaução, pois isto bloqueia todas as mensagens "
 "de qualquer contacto que não estiver na sua lista."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2102,13 +1971,13 @@ msgstr ""
 "(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
 "disponível, ausente, ocupado, etc...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -2117,110 +1986,135 @@ msgstr ""
 "Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
 "gráficos equivalentes."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 #, fuzzy
 msgid "Ma_nage..."
 msgstr "Gerir..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "Modificação da Conta"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notificar-me"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Mostrar a mensagem como pop-up"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Servidor:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Mostrar apenas na _lista"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "Mostrar apenas na _lista"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Estado"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "Iconset de _estados padrão:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "Interrompida"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 #, fuzzy
 msgid "T_heme:"
 msgstr "Tema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2228,7 +2122,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2236,619 +2130,582 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "Usar iconsets de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "Quando um novo evento é recebido"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Introduza a sua mensagem :"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Antes da alcunha:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "Marcar automaticamente como _ausente depois de:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "Gerir Emoticons"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar eventos de contactos que não estão na lista"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "Marcar automaticamente como _indisponível depois de:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 #, fuzzy
 msgid "_Open..."
 msgstr "Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 #, fuzzy
 msgid "_Reset to Default Colors"
 msgstr "Voltar às Cores Padrão"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 #, fuzzy
 msgid "_Status message:"
 msgstr "Mensagem de estado:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "_Entrar num Chat"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "Fora da lista"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutos"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 #, fuzzy
 msgid "Privacy Lists:"
 msgstr "Iniciar Conversa"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 #, fuzzy
 msgid "<b>List of rules</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 #, fuzzy
 msgid "Active on each startup"
 msgstr "_Ligar ao arranque"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "_Subscrição"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Negar"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 #, fuzzy
 msgid "JabberID"
 msgstr "Jabber ID:"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 #, fuzzy
 msgid "Order:"
 msgstr "Servidor:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 #, fuzzy
 msgid "all by subscription"
 msgstr "_Subscrição"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 #, fuzzy
 msgid "all in the group"
 msgstr "Neste grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Ambos"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "De"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "Nenhum"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+msgid "to"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 #, fuzzy
 msgid "to send me messages"
 msgstr "Enviar mensagem"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr ""
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 #, fuzzy
 msgid "to send me status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 #, fuzzy
 msgid "to view my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
 msgid "<b>Address</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "Definir _Avatar"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Birthday:</b>"
 msgstr "Aniversário"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 #, fuzzy
 msgid "<b>Company:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "Departamento:"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Mail:"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "Complemento:"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "Família:"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "Página pessoal:"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../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/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "Alcunha:"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "Telefone:"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../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/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../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/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>Registos</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>Definições</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../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>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sons</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Sobre"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr ""
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 #, fuzzy
 msgid "Personal Info"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Remover conta _apenas do Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "Apagar MOTD"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "_Adicionar Contacto"
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "Recursos dos Servidores"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Transferências de Ficheiros"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Questões Perguntadas Frequentemente (FAQ) (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Ajuda online"
 
-#: ../data/glade/roster_window.glade.h:8
-#, fuzzy
-msgid "Profile, A_vatar"
-msgstr "Perfil, Avatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 #, fuzzy
 msgid "Show Trans_ports"
 msgstr "Transportes"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Mostrar _Lista de Contactos"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "Contas"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Acções"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Conteúdo"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Preferências"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Sair"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "Enviar _Mensagem Simples"
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 #, fuzzy
 msgid "_View"
 msgstr "_Voz"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr ""
 "Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
 "feita "
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 #, fuzzy
 msgid "Search"
 msgstr "_Pesquisar"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "Adicionar _Contacto"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "Informações do Contacto"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Ir"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registar para"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "De:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Responder a esta mensagem"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Enviar"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Para:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "E_nviar & Fechar"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 #, fuzzy
 msgid "Au_thorize"
 msgstr "_Autorizar"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
@@ -2857,191 +2714,206 @@ msgstr ""
 "Recusar autorização do contacto, para que ele não possa saber quando você "
 "está ligado"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Pedido de Subscrição"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 #, fuzzy
 msgid "Mute Sounds"
 msgstr "Sons Wav"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enviar _Mensagem Simples"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Es_tado"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "C_hat"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Definições</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID:"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "Recurso:"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>Definições</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>Descrição</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>Definições Personalizadas</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 #, fuzzy
 msgid "Comments"
 msgstr "Comentário: %s"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "Configurar _Sala"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 #, fuzzy
 msgid "Contact"
 msgstr "Contacto:"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Informações do Contacto"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Mais"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "_Escolher Avatar"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Registos</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Tráfego Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Activar"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IC"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Modificar Conta..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr ""
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 #, fuzzy
 msgid "Personal"
 msgstr "Detalhes Pessoais..."
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Cliente Jabber GTK+"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "Informações do Contacto"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3069,7 +2941,7 @@ msgstr "Neste grupo"
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr ""
 
@@ -3212,134 +3084,134 @@ msgstr ""
 msgid "Chinese (Ch)"
 msgstr ""
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr ""
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "Sublinhar"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "Serviço"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "Letra:"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "Informações do Contacto"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "Encriptação activada"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, 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:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "Usar autenticação"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "Usar autenticação"
@@ -3347,58 +3219,58 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[Esta mensagem é encriptada]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Recebeu uma nova mensagem de \"%s\""
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3406,135 +3278,145 @@ msgstr ""
 "Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
 "perdida."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "a criar base de dados dos logs"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim irá agora sair"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "a criar directório %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 #, fuzzy
 msgid "Change status information"
 msgstr "Informações do Contacto"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 #, fuzzy
 msgid "Change status"
 msgstr "Contacto Saiu"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 #, fuzzy
 msgid "Free for chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 #, fuzzy
 msgid "Online"
 msgstr "_Continuar"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr ""
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 #, fuzzy
 msgid "Presence description:"
 msgstr "Descrição"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "Chat"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, 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:194
+#: ../src/common/commands.py:201
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "Neste grupo"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "Chat"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "Já está na sala %s"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr "Gajim - %d mensagem não lida"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3632,9 +3514,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "Apagar MOTD"
@@ -3889,11 +3771,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:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3901,7 +3783,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:230
+#: ../src/common/config.py:231
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3910,7 +3792,7 @@ msgstr ""
 "Se Falso (False), deixará de ver a linha de estados em conversas quando um "
 "contacto mudar de estado ou de mensagem de estado."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3919,35 +3801,35 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr ""
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr ""
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr ""
 
-#: ../src/common/config.py:239
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3955,7 +3837,7 @@ msgid ""
 msgstr ""
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3967,49 +3849,49 @@ msgid ""
 "specific window."
 msgstr ""
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 #, fuzzy
 msgid "Hides the banner in a group chat window"
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr ""
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 #, 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:251
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -4018,326 +3900,352 @@ 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:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../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:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr ""
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
 msgstr ""
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 #, fuzzy
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr ""
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr ""
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr ""
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr ""
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 #, fuzzy
 msgid "I'm out enjoying life."
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 #, fuzzy
 msgid "I'm available."
 msgstr "Disponível"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 #, fuzzy
 msgid "I'm free for chat."
 msgstr "Livre para conversar"
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr ""
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 #, fuzzy
 msgid "I'm not available."
 msgstr "Serviço não disponível"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr ""
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr ""
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:490
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4346,107 +4254,98 @@ 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:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr ""
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 #, fuzzy
 msgid "Unable to load idle module"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:251
-#, fuzzy
-msgid "Wrong host"
-msgstr "Frase de acesso"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informação de registo para o transport %s não chegou a tempo"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr "Publicação vCard deu-se com sucesso"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, fuzzy, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Alcunha não encontrada: %s"
@@ -4454,79 +4353,79 @@ msgstr "Alcunha não encontrada: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 #, fuzzy
 msgid "Unable to join group chat"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "Está banido/a desta sala."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Criação de salas encontra-se restrita."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "A sua alcunha registada tem de ser usada."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Não está na lista de membros."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Autorização foi removida"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "pedido de remoção de subscrição por %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "já não estamos subscritos a %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4666,28 +4565,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4696,156 +4595,156 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr ""
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 #, fuzzy
 msgid "Invalid answer"
 msgstr "Senha Inválida"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 
-#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "Ligação"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "Versão D-Bus desconhecida: %s"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 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:1300
+#: ../src/common/connection.py:1378
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "erro ao enviar"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Contacto:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr ""
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 #, fuzzy
 msgid "Observers"
 msgstr "Servidor"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 #, fuzzy
 msgid "Not in roster"
 msgstr "Fora da lista"
@@ -4855,39 +4754,53 @@ msgstr "Fora da lista"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
+#: ../src/common/dbus_support.py:54
+#, 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/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, 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"
+
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Serviço/Recurso indisponível: Gajim não está a correr, ou remote_control é "
 "False"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
+"Try reading %(url)s"
+msgstr "Bus da sessão não está disponível."
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
+msgstr "Bus da sessão não está disponível."
 
 #: ../src/common/fuzzyclock.py:38
 msgid "twelve"
@@ -5062,244 +4975,281 @@ msgstr ""
 msgid "Weekend!"
 msgstr ""
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Caractere inválido no nome de utilizador"
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Endereço de servidor necessário."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Caractere inválido no hostname."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Caractere inválido no recurso."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Indisponível"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Livre para conversar"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Livre para conversar"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Disponível"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Ligando"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "A_usente"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Offline"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Offline"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "In_visível"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Contém erros"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Nenhuma"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Nenhum"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Subscrição"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 #, fuzzy
 msgid "Owner"
 msgstr "_Dono"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 #, fuzzy
 msgid "Administrator"
 msgstr "_Administrador"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 #, fuzzy
 msgid "Member"
 msgstr "_Membro"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "está a prestar atenção à conversa"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "está a fazer outra coisa qualquer"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "pausa na composição da mensagem"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "Enviar mensagem"
 msgstr[1] "Enviar mensagem"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "De %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Configuração da Sala"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5309,17 +5259,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Mensagem de Estado"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Tamanho: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "a criar base de dados dos logs"
@@ -6022,22 +6029,22 @@ msgstr ""
 msgid "Writing"
 msgstr "A trabalhar"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 #, fuzzy
 msgid "Unknown Artist"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 #, fuzzy
 msgid "Unknown Title"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 #, fuzzy
 msgid "Unknown Source"
 msgstr "Tipo desconhecido %s"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -6045,19 +6052,19 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../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:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6123,291 +6130,287 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "erro ao enviar"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr ""
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "Mensagem de Estado"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "Activar"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, fuzzy, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Uma ligação não está disponível"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, 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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr ""
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 
-#: ../src/config.py:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr ""
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr ""
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, fuzzy, python-format
 msgid "You have opened chat in account %s"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 #, 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:1836
+#: ../src/config.py:1941
 #, fuzzy
 msgid "Account Name Already Used"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "Gerir Contas"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 #, fuzzy
 msgid "OpenPGP Key Selection"
 msgstr "Encriptação OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr ""
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 #, 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:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 #, fuzzy
 msgid "Account Local already exists."
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr ""
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 #, fuzzy
 msgid "Member List"
 msgstr "_Membro"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 #, fuzzy
 msgid "Owner List"
 msgstr "_Dono"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 #, fuzzy
 msgid "Administrator List"
 msgstr "_Administrador"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr ""
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 #, fuzzy
 msgid "Nick"
 msgstr "_Expulsar"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 #, fuzzy
 msgid "Role"
 msgstr "Função:"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 #, fuzzy
 msgid "Banning..."
 msgstr "Banindo %s"
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 #, fuzzy
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr ""
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr ""
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 #, fuzzy
 msgid "Adding Administrator..."
 msgstr "_Administrador"
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6417,63 +6420,91 @@ msgid ""
 "domain/resource, or address containing a subdomain)."
 msgstr ""
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Encriptação desactivada"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Ligação"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "<b>O que pretende fazer?</b>"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Remover conta _apenas do Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 #, fuzzy
 msgid "Default"
 msgstr "Apagar MOTD"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 #, fuzzy
 msgid "?print_status:All"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr ""
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 #, fuzzy
 msgid "?print_status:None"
 msgstr "Mostrar hora:"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 #, fuzzy
 msgid "New Group Chat"
 msgstr "Chat"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6481,31 +6512,31 @@ msgstr ""
 "bookmark"
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6516,34 +6547,34 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6553,7 +6584,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6561,65 +6592,65 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr ""
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "Nova Mensagem"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 #, fuzzy
 msgid "Contact Connected"
 msgstr "Nome do Contacto"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 #, fuzzy
 msgid "Contact Disconnected"
 msgstr "Contacto Entrou"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 #, fuzzy
 msgid "Message Sent"
 msgstr "Mensagem"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr ""
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr ""
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 #, fuzzy
 msgid "GMail Email Received"
 msgstr "Convite Recebido"
@@ -6640,45 +6671,45 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde que prestou atenção a este "
 "chat pela última vez."
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "_Sair"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, fuzzy, python-format
 msgid "_Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr ""
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6686,7 +6717,7 @@ msgstr[0] "Ontem"
 msgstr[1] "Ontem"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -6799,73 +6830,73 @@ 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "ID de Utilizador inválido"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 #, 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:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Contacto já se encontra na lista"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Este contacto já se encontra na sua lista de contactos."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 #, fuzzy
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr ""
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr ""
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr ""
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6874,107 +6905,107 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, fuzzy, python-format
 msgid "You are already in group chat %s"
 msgstr "Já está na sala %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Nome de conta inválido"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, 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:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr ""
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, 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:2221
+#: ../src/dialogs.py:2363
 #, 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:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 #, fuzzy
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
@@ -6984,177 +7015,175 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 #, fuzzy
 msgid "Invalid JID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, fuzzy, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível escrever ficheiro em %s"
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 #, fuzzy
 msgid "New E-mail"
 msgstr "E-Mail"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 #, fuzzy
 msgid "Groupchat Invitation"
 msgstr "?Função do Contacto no Chat:Nenhuma"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 #, fuzzy
 msgid "Contact Changed Status"
 msgstr "Contacto Saiu"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, fuzzy, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, fuzzy, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Consola XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Interrompida"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Remover"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7162,163 +7191,164 @@ msgid ""
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 #, fuzzy
 msgid "Add"
 msgstr "Endereço"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "_Modificar"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+#, fuzzy
+msgid "Delete"
+msgstr "Apagar MOTD"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "Grupo"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Adicionar _Contacto"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Remove o contacto da lista"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr ""
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 
-#: ../src/dialogs.py:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Descrição: %s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 #, fuzzy
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 #, fuzzy
 msgid "<b>Add a rule</b>"
 msgstr "<b>Formato de uma linha</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr ""
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 #, fuzzy
 msgid "Privacy Lists"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 #, fuzzy
 msgid "Invalid List Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 #, 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:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "Está banido/a desta sala."
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr ""
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 #, fuzzy
 msgid "Condition"
 msgstr "Ligação"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr ""
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7326,38 +7356,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7367,77 +7397,77 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Tem de estar ligado para ver os serviços"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, fuzzy, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar Serviço usando conta %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Buscar Serviço"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "O serviço não pôde ser encontrado"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7445,96 +7475,101 @@ 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:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Serviço não explorável"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "usando a conta %s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Explorar"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 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:1288
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "comando"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr ""
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Bookmark já está configurado"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, fuzzy, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Sala \"%s\" já existe nos seus bookmarks."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Bookmark foi adicionado com sucesso"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscrição"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr ""
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 #, fuzzy
 msgid "_Unsubscribe"
 msgstr "_Subscrever"
@@ -7584,7 +7619,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7750,103 +7785,91 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "Recursos dos Servidores"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tempo"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Guardado em: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Transferência de ficheiro completa"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Abrir Pasta"
+
+#: ../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:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, fuzzy, python-format
 msgid "Recipient: %s"
 msgstr "Destinatário: "
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, fuzzy, python-format
 msgid "Error message: %s"
 msgstr "Introduza a sua mensagem :"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "Transferência de Ficheiro Parada"
@@ -7855,7 +7878,7 @@ msgstr "Transferência de Ficheiro Parada"
 msgid "Choose File to Send..."
 msgstr "Escolher Ficheiro para Enviar"
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "Descrição: %s"
@@ -7888,34 +7911,34 @@ msgstr "Descrição: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr ""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Este ficheiro já existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 #, 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr ""
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr ""
 
@@ -7951,81 +7974,60 @@ msgstr "Ficheiro: "
 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:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: ../src/gajim.py:141
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do PyGTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim necessita do GTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr ""
 "Gajim necessita do GTK versão 2.6 ou acima para ser executado. Saindo..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Falta suporte libglade para o runtime GTK+"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Por favor remova o seu runtime GTK+ actual e instale a última versão estável "
-"de %s"
-
-#: ../src/gajim.py:193
-#, fuzzy
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no seu "
-"sistema."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim necessita do PySQLite2 para ser executado"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 #, fuzzy
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim necessita do PySQLite2 para ser executado"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8033,11 +8035,11 @@ msgid ""
 msgstr ""
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr ""
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8081,8 +8083,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "conta"
 
@@ -8104,14 +8106,17 @@ msgid "status"
 msgstr "estado"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "um de: offline, disponível, livre para conversar, ausente, indisponível, "
 "ocupado, invisível"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "mensagem"
 
@@ -8365,79 +8370,95 @@ msgid ""
 msgstr ""
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "conteúdo da mensagem"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "_Juntar-se a uma Nova Sala"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "room"
 msgstr "De"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "Sala:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "nick"
 msgstr "_Expulsar"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "password"
 msgstr "Senha:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "As senhas não conferem"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr ""
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "Mostra ou esconde a janela principal"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento em falta \"contacto_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8446,31 +8467,31 @@ msgstr ""
 "'%s' não está na sua lista.\n"
 "Por favor, especifique a conta para enviar a mensagem"
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Não tem nenhuma conta activa"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumentos:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s não encontrado"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8479,7 +8500,7 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um de:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8488,7 +8509,7 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8497,7 +8518,11 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Frase de acesso"
@@ -8528,201 +8553,202 @@ msgstr "Não pode apagar o seu tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Falha ao enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 #, fuzzy
 msgid "Insert Nickname"
 msgstr "Muda Alcu_nha"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "Histórico das Conversas"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "Ligação"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Filiação: "
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, fuzzy, python-format
 msgid "%s has joined the group chat"
 msgstr "Neste grupo"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 está agora %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 #, 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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
 #, fuzzy
 msgid "Do _not ask me again"
 msgstr "_Não voltar a perguntar"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Mudar Assunto"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Mudar Alcunha"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique a nova alcunha a usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "Descrição: %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -8743,61 +8769,61 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Reportar Erro (Bug)"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 #, fuzzy
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim - Um cliente Jabber GTK+"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Deseja sobre-escrevê-lo?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:881
+#: ../src/gtkgui_helpers.py:924
 #, fuzzy
 msgid "Save Image as..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8807,166 +8833,166 @@ 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:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) Autorização para %s (id: %s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 #, fuzzy
 msgid "Connection Failed"
 msgstr "Ligação"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "Pedido de Subscrição"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "_Subscrever"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8976,104 +9002,105 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "Remove o contacto da lista"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 #, 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 #, fuzzy
 msgid "Error."
 msgstr "Erro:"
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "Recurso: "
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9081,15 +9108,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9100,92 +9127,102 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "Ligação"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"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:2064
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "Encriptação desactivada"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 #, 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "O utilizador será ligado a %s sem OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
@@ -9194,46 +9231,46 @@ msgstr ""
 msgid "_New Group Chat"
 msgstr "Chat"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 #, fuzzy
 msgid "Cannot find history logs database"
 msgstr "a criar base de dados dos logs"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 #, fuzzy
 msgid "Contacts"
 msgstr "Contacto:"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Data:"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 #, fuzzy
 msgid "Nickname"
 msgstr "Alcunha:"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Mensagem"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9242,27 +9279,27 @@ msgid ""
 "In case you click YES, please wait..."
 msgstr ""
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 #, fuzzy
 msgid "Exporting History Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr ""
 
-#: ../src/history_manager.py:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr ""
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] ""
@@ -9303,40 +9340,40 @@ msgstr "O estado é agora: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr ""
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 #, fuzzy
 msgid "Chats"
 msgstr "Conversa"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 #, fuzzy
 msgid "Group Chats"
 msgstr "Chat"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 #, fuzzy
 msgid "Private Chats"
 msgstr "Iniciar Conversa"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 #, fuzzy
 msgid "Messages"
 msgstr "Mensagem"
@@ -9349,22 +9386,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, fuzzy, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s está agora %(status)s"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, fuzzy, python-format
 msgid "%(nickname)s Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, fuzzy, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "Contacto Saiu"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, fuzzy, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova Mensagem Instantânea"
@@ -9389,7 +9426,7 @@ msgstr "Nova Mensagem como %s"
 msgid "New Message from %(nickname)s"
 msgstr "Nova Mensagem como %s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "_Continuar"
@@ -9398,12 +9435,12 @@ msgstr "_Continuar"
 msgid "Retrieving profile..."
 msgstr ""
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "Localização do ficheiro"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "Tal sala não existe."
@@ -9411,7 +9448,7 @@ msgstr "Tal sala não existe."
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr ""
 
@@ -9445,51 +9482,51 @@ msgstr ""
 "Ocorreu um erro na publicação das suas informações pessoais. Tenta novamente "
 "mais tarde."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "O utilizador será ligado a %s sem OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9497,28 +9534,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, 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:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Cancelar transferência de ficheiro"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9526,16 +9574,16 @@ msgid ""
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr ""
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9544,12 +9592,12 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 #, fuzzy
 msgid "Transports will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, fuzzy, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9558,72 +9606,72 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 #, 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:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 #, fuzzy
 msgid "Rename Contact"
 msgstr "Contacto:"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, fuzzy, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 #, fuzzy
 msgid "Rename Group"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, fuzzy, python-format
 msgid "Enter a new name for group %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 #, fuzzy
 msgid "Remove Group"
 msgstr "_Remover"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr ""
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Remove o contacto da lista"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -9633,12 +9681,12 @@ msgstr ""
 "sempre como offline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "<b>O que pretende fazer?</b>"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9646,17 +9694,17 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 #, fuzzy
 msgid "Contacts will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9665,68 +9713,68 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr ""
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
 msgstr ""
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 #, 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:3986
+#: ../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."
 msgstr ""
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ficheiro Inválido"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
@@ -9736,139 +9784,143 @@ msgstr "Envia um ficheiro a um contacto"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 #, fuzzy
 msgid "_Manage Bookmarks..."
 msgstr "Gerir Bookmarks..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, fuzzy, python-format
 msgid "of account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "_Publicar"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "_Publicar"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "_Descobrir Recursos..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 #, fuzzy
 msgid "Send Group M_essage"
 msgstr "Nova Mensagem"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr ""
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 #, fuzzy
 msgid "To all online users"
 msgstr "Utilizadores _Online"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "Contacto:"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "E_nviar Mensagem Simples"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr ""
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "Transportes"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "Transportes"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "Contacto Entrou"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "Contacto Entrou"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 #, fuzzy
 msgid "History Manager"
 msgstr "_Histórico"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 #, fuzzy
 msgid "_Join New Group Chat"
 msgstr "_Entrar num Chat"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
@@ -9903,9 +9955,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9918,120 +9970,130 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "Fora da lista"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 #, fuzzy
 msgid "Jabber ID: "
 msgstr "Jabber ID:"
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr ""
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, fuzzy, python-format
 msgid "Last status: %s"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, fuzzy, python-format
 msgid " since %s"
 msgstr "Versão %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "Ligação"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "Contacto Entrou"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Subscrição:"
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "Tipo:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Modificação da Conta"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Parada"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Completa"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 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:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -10039,30 +10101,30 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -10070,7 +10132,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:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -10078,30 +10140,293 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 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:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "_Entrar num Chat..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Adicionar Contacto"
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Descobrir Recursos"
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "_Modificar Conta..."
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "Detalhes Pessoais..."
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "_Iniciar Conversa"
+
+#~ msgid "_Status"
+#~ msgstr "E_stado"
+
+#~ msgid "Account Modification"
+#~ msgstr "Modificação da Conta"
+
+#~ 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 ""
+#~ "Marque esta opção se quiser que o Gajim se ligue usando a porta 5223, "
+#~ "onde se espera que servidores específicos possuem capacidades SSL. Note "
+#~ "que o Gajim usa encriptação TLS por defeito se emitida pelo servidor, e "
+#~ "que com esta opção marcada o TLS será desactivado."
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Editar Detalhes Pessoais..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Nome do Host:"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Se marcado, o Gajim guardará a sua senha em ~/.gajim/config com permissão "
+#~ "de 'leitura' apenas para si"
+
+#~ msgid "Port: "
+#~ msgstr "Porta:"
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Guardar _frase de acesso (inseguro)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Enviar pacotes keep-alive"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Usar _SSL (específica)"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Apagar MOTD"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "E_nviar Mensagem de Servidor"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Entrar num Chat"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Copiar JID/Endereço de Email"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Copiar Localização do Link"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Abrir Compositor de Email"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Abrir Link no Navegador"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Iniciar Conversa"
+
+#, fuzzy
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Count\n"
+#~ "Grupo\n"
+#~ "Contacto\n"
+#~ "Banner"
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "Muda Alcu_nha"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "Muda A_ssunto"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "Configurar _Sala"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "Gerir Bookmarks"
+
+#~ msgid "Send _File"
+#~ msgstr "Enviar _Ficheiro"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Adicionar à Lista"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "E_nviar Mensagem Privada"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Gerir Contas"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "Apagar MOTD"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Adiciona o contacto à lista"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Adicionar esta Sala aos _Bookmarks"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Muda Alcu_nha"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "está a prestar atenção à conversa"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Clique para inserir um emoticon (Alt+E)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "Clique para inserir um emoticon (Alt+E)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Clique para inserir um emoticon (Alt+E)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Todos os estados da conversa\n"
+#~ "Apenas compondo uma mensagem\n"
+#~ "Desactivado"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Auto-detectar a cada arranque da aplicação\n"
+#~ "Usar sempre aplicações GNOME padrão\n"
+#~ "Usar sempre aplicações KDE padrão\n"
+#~ "Personalizar"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "Apagar MOTD"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "_Adicionar Contacto"
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "Recursos dos Servidores"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Transferências de Ficheiros"
+
+#, fuzzy
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Perfil, Avatar"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "Contas"
+
+#~ msgid "_Contents"
+#~ msgstr "_Conteúdo"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Preferências"
+
+#~ msgid "_Quit"
+#~ msgstr "_Sair"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "Enviar _Mensagem Simples"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Enviar _Mensagem Simples"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Es_tado"
+
+#~ msgid "_Group Chat"
+#~ msgstr "C_hat"
+
+#~ msgid "Enable"
+#~ msgstr "Activar"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Modificar Conta..."
+
+#, fuzzy
+#~ msgid "Wrong host"
+#~ msgstr "Frase de acesso"
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "Falta suporte libglade para o runtime GTK+"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Por favor remova o seu runtime GTK+ actual e instale a última versão "
+#~ "estável de %s"
+
+#, fuzzy
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no "
+#~ "seu sistema."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim necessita do PySQLite2 para ser executado"
+
 #, fuzzy
 #~ msgid "_Incoming message:"
 #~ msgstr "Mensagem recebida:"
@@ -10285,10 +10610,6 @@ msgstr " recurso com prioridade "
 #~ msgstr "para conta %s"
 
 #, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>Definições Personalizadas</b>"
-
-#, fuzzy
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Jabber ID Inválido"
 
@@ -10439,9 +10760,6 @@ msgstr " recurso com prioridade "
 #~ msgstr ""
 #~ "Guardar _posição e tamanho das janelas de conversa e lista de contactos"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Mostrar apenas na _lista"
-
 #~ msgid "The auto away status message"
 #~ msgstr "A mensagem de estado auto-ausente"
 
@@ -10476,18 +10794,9 @@ msgstr " recurso com prioridade "
 #~ msgid "_Before time:"
 #~ msgstr "Antes da hora:"
 
-#~ msgid "_Never"
-#~ msgstr "_Nunca"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Notificar-me"
-
 #~ msgid "_Player:"
 #~ msgstr "_Tocador de som:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Mostrar a mensagem como pop-up"
-
 #~ msgid "Address"
 #~ msgstr "Endereço"
 
@@ -10879,9 +11188,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Open Download Page"
 #~ msgstr "Abrir Página para Download"
 
-#~ msgid "Session bus is not available."
-#~ msgstr "Bus da sessão não está disponível."
-
 #, fuzzy
 #~ msgid "with account "
 #~ msgstr "conta: "
@@ -11028,9 +11334,6 @@ msgstr " recurso com prioridade "
 #~ msgid "Always use compact _view"
 #~ msgstr "Usar sempre _vista compacta"
 
-#~ msgid "Banner:"
-#~ msgstr "Faixa:"
-
 #~ msgid ""
 #~ "If checked, all chat and group chat windows will have the information "
 #~ "area in the top and the buttons area in the bottom hidden. You can quick "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 8da537eae..033c7a552 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-10 10:13+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -23,59 +23,11 @@ msgstr ""
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-Country: BRAZIL\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Um cliente Jabber GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "_Entrar em uma conferência..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Adicionar contato..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Descubra serviços"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Executar comando..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Alterar conta"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Abrir caixa de entrada do GMail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "Eventos _pessoais"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Iniciar conversa..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -85,23 +37,23 @@ msgstr ""
 "\n"
 "Por favor aguarde..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Por favor escolha uma das opções abaixo:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 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/glade/account_creation_wizard_window.glade.h:6
+#: ../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/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -109,57 +61,64 @@ msgstr ""
 "Adicionar este certificado na lista de certificados confiáveis.\n"
 "SHA1 fingerprint do certificado:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Autenticação anôn_ima"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Conectar quando eu clicar em Concluir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente de configuração de conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Eu já tenho uma conta e quero _usá-la"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Eu quero _registrar uma nova conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Se marcado, o Gajim irá memorizar a senha para esta conta"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Gerenciar..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Nenhum"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_y:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Salvar sen_ha"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Configurar perfil quando eu conectar"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Usa nome de máquina/porta customizados"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -167,148 +126,142 @@ msgstr ""
 "Você precisa ter uma conta para conectar na\n"
 "rede Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Concluir"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Nome do computador:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diversos</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Informações pessoais</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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 "Aj_ustar para status"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Conta"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Alteração da conta"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Contas"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Operações de administração"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Autenticação anônima"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Reconectar automaticamente quando a conexão cair"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar na inicialização do Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "A_lterar senha"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Marque esta opção para o Gajim se conectar na porta 5223 onde servidores "
-"antigos disponibilizam recursos SSL. Note que o Gajim usa criptografia TLS "
-"por padrão se disponibilizada pelo servidor e com esta opção habilitada o "
-"TLS será desabilitado"
+"Marcando esta opção, o Gajim irá perguntar você antes de enviar sua senha "
+"através de uma conexão não-segura."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "_Escolha a chave..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Clique para mudar a senha da conta"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Clique para requisitar autorização para todos os contatos de outra conta"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Co_nectar na inicialização do Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Conexão"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Editar detalhes pessoais..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Email:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Primeiro nome:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1156
-#: ../src/common/helpers.py:1168 ../src/notify.py:553 ../src/notify.py:574
-#: ../src/notify.py:612 ../src/notify.py:624
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:61 ../src/common/contacts.py:141
-#: ../src/dialogs.py:110 ../src/dialogs.py:120 ../src/roster_window.py:2763
-#: ../src/roster_window.py:5252
+#: ../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 "Geral"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Nome do computador: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -317,8 +270,11 @@ msgstr ""
 "então a transferência de arquivo tem grandes possibilidades de executar "
 "corretamente."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Se marcado, o Gajim obterá a senha de um agente GPG como o Seahorse"
+
+#: ../data/gui/accounts_window.ui.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -326,16 +282,7 @@ msgstr ""
 "Se marcado, o Gajim irá enviar pacotes keep-alive para prevenir timeout na "
 "conexão, evitando-a cair"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Se checado, o Gajim irá gravar sua senha em ~/.gajim/config com permissão de "
-"'leitura' somente para você"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -343,8 +290,7 @@ msgstr ""
 "Se marcado, o Gajim, quando carregado, irá conectar automaticamente ao "
 "jabber usando esta conta"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -353,47 +299,49 @@ 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/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Informações sobre você são gravadas no servidor"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1740
-#: ../src/config.py:2290
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Último nome:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Mes_clar contas"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1253
-#: ../src/config.py:1356 ../src/config.py:1644 ../src/config.py:1649
-#: ../src/config.py:2197 ../src/config.py:2276 ../src/config.py:2289
-#: ../src/config.py:3492 ../src/config.py:3565 ../src/dialogs.py:307
-#: ../src/dialogs.py:309 ../src/dialogs.py:512 ../src/dialogs.py:525
-#: ../src/roster_window.py:2817 ../src/roster_window.py:2823
-#: ../src/roster_window.py:2828
-msgid "None"
-msgstr "Nenhum"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Informações pessoais"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Porta: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "_Prioridade:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -403,22 +351,20 @@ msgstr ""
 "servidor jabber quando dois ou mais clientes estão conectados usando a mesma "
 "conta; O cliente com a maior prioridade receberá os eventos"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "A prioridade será alterada automaticamente de acordo com o seu status."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxy:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Re_nomear"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Recur_so:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -432,199 +378,89 @@ msgstr ""
 "conta com o recurso 'Casa' e 'Trabalho' ao mesmo tempo. O recurso que "
 "possuir a maior prioridade receberá os eventos. (veja abaixo)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Salvar _frase de acesso (inseguro)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Salvar his_tórico para todos os contatos desta conta"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
 msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "_Sincronizar status da conta com status global"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Sincronizar contatos"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Usar _SSL (obsoleto, apenas para servidores antigos)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Usar proxies de transferência de arquivos"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Ajustar para status"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Nome:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxy</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "Aj_ustar para status"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Contas"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Autenticação anônima"
-
-#: ../data/glade/accounts_window.glade.h:13
-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."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Co_nectar na inicialização do Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Email:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Primeiro nome:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Se marcado, o Gajim obterá a senha de um agente GPG como o Seahorse"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1767
-#: ../src/dialogs.py:829
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Último nome:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Mes_clar contas"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5207
-msgid "Re_name"
-msgstr "Re_nomear"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Enviar pacotes para manter a conexão (keep-alive)"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Sincroni_zar status da conta com status global"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Sincronizar contatos"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Usar o Agente G_PG"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Usa nome de máquina/porta personalizad_os"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Usar porta pers_onalizada:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Usar proxies de transferência de arquivos"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "_Editar detalhes pessoais..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "Ha_bilitar"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Nome do computador:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "Gere_nciar..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Porta:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "A_visar antes de usar uma conexão não-segura"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_usar variável de ambiente HTTP__PROXY"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "C_onta:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Adicionar novo contato"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -636,7 +472,7 @@ msgstr ""
 "contatos deste protocolo. Clique no \n"
 "botão Registrar para aceitar."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -644,411 +480,468 @@ msgstr ""
 "Você deve estar conectado para que o transporte \n"
 "possa adicionar um contato desse protocolo."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Apelido:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protocolo:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registrar"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Ocorreu um erro:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Escolha um comando para executar</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Comandos ad-hoc - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Verificar novamente"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Descrição do erro..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Por favor aguarde enquanto a lista de comandos é recuperada..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Por favor aguarde enquanto a lista de comandos é enviada..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Por favor aguarde..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Esta entidade jabber não expõe quaisquer comandos."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Descrição</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Editor de configurações avançado"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Excluir MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Excluir mensagem do dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Editar listas de _privacidade..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 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/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Definir MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Configurar mensagem do dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Exibir console _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Atualizar MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Atualizar mensagem do dia"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Enviar mensagem de servidor..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Ações</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Condições</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Sons</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Ações avançadas"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Controle avançado de notificações"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Totos os status"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:106 ../src/common/helpers.py:231
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Afastado"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Ocupado "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:241
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Executar um comando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:214
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Não disponível"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Um ou mais status especiais..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Online / Livre para conversa"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Tocar um som"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Mensagem recebida\n"
-"Contato desconectado \n"
-"Status do contato alterado \n"
-"Destacar mensagens em conferências \n"
-"Mensagem de conferência recebida \n"
-"Transferência de arquivo solicitada \n"
-"Transferência de arquivo iniciada \n"
-"Transferência de arquivo concluída"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../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/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Desativar janelas popup existentes"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Desativar sons existentes para este evento"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Desativar exibição de eventos na lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Desativar a exibição de eventos na bandeja do sistema"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Notificar-me com uma janela popup"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Abrir janela de conversa com o contato"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "Mo_strar somente na lista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Exibir evento na bandeja do sistema"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "e eu "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"contato(s)\n"
-"grupo(s)\n"
-"todo mundo"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "para "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Entrada:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Nome do feed:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Modificado:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Novo evento recebido"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Você recebeu uma nova entrada:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Contatos bloqueados"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Mensagem:</b> "
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Definir atividade"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Define uma atividade"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Mensagem:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Humor:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Alterar senha"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Digite novamente para confirmar:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Digite sua nova senha:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:657
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Atividade:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:652
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Humor:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Modelos de mensagens"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Salvar como modelos..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "_Entrar em uma conferência"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Adicionar à lista..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Copiar e-mail/JID"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Copiar URL"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Abrir cliente de e-mail"
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Visualizar no navegador"
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Iniciar conversa"
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Enviar"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "Con_vidar"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Convidar amigos!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "Servidor MUC"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Por favor, selecione um servidor MUC."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1056,190 +949,188 @@ msgstr ""
 "Você está prestes a iniciar uma Conversa Multi-Usuário (MUC).\n"
 "Selecione os contatos que você quer convidar"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Adicionar _notificação especial..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Atribuir chave Open_PGP..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "E_xecutar comando..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Editar _grupos..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5162
-#: ../src/roster_window.py:5317
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "Con_vidar para"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Convidar _contatos"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5172
-#: ../src/roster_window.py:5404
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Enviar status perso_nalizado"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Enviar _mensagem simples..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Enviar _arquivo..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Definir _avatar personalizado..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Iniciar _conversa"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Alternar para criptografia End to End"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Ativar criptografia Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Adicionar à lista..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Permitir que ele/ela veja meu status"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5231
-#: ../src/roster_window.py:5354 ../src/roster_window.py:5481
+#: ../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 "_Bloquear"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Proibir ele/ela de ver meu status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5550
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignorar"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Gerenciar contato"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Renomear..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Inscrição"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5225
-#: ../src/roster_window.py:5348 ../src/roster_window.py:5478
+#: ../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 "_Desbloquear"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "Nã_o ignorar"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Preencha o formulário."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Configuração da sala"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Editar grupos"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(Informações <b>ESession</b>)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Verificar"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Recursos"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Cancelar transferência de arquivo"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Cancela a transferência de arquivo selecionada"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Limpar"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Transferência de arquivos"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Esconder a janela"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Remover a transferência de arquivo da lista."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1247,75 +1138,74 @@ 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/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:788
-msgid "_Continue"
-msgstr "_Continuar"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:205
-msgid "_Open Containing Folder"
-msgstr "_Abrir pasta do arquivo"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "lista de transferência de arquivos"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Aba de cores do bate-papo</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Linha conta\n"
-"Linha grupo\n"
-"Linha contato\n"
-"Banner de conversa"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Conta"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Escrevendo"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Contato"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Estilo da fonte:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Customização de temas do Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Enviado"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Grupo"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inativo"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1323,7 +1213,7 @@ msgstr ""
 "MUC\n"
 "mensagens"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1331,109 +1221,73 @@ msgstr ""
 "MUC Direto\n"
 "mensagens"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pausado"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "_Cor do texto"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Fonte do texto"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "Cor _de fundo"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Alterar _apelido..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Alterar as_sunto..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Configurar _sala..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1745
-msgid "_Bookmark"
-msgstr "Ma_rcadores"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Excluir sala"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Gerenciar sala"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimizar ao fechar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Ações de ocupante"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Enviar _arquivo"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Adicionar à lista"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Administração"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Chutar"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "Proprietári_o"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Enviar mensagem privada"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Criar nova postagem"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:256
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "De"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:188
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
 #: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Assunto"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1444,25 +1298,19 @@ msgstr ""
 "Gajim não está executando. Evite apagamentos com contatos que você esteja "
 "conversando no momento."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3056
-#: ../src/dialogs.py:3153
-msgid "Delete"
-msgstr "Deletar"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Exportar"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gerenciador de histórico de logs do Gajim"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1476,499 +1324,419 @@ msgstr ""
 "Use este programa para deletar ou exportar logs. Você pode selecionar logs "
 "ao lado e/ou pesquisar na base de dados abaixo."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Buscar no banco de dados"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Digite o JID ou o nome do contato\n"
-"Históricos das salas\n"
-"Todos os históricos de conversa"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Nome do contato"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Salas"
+
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Pesquisar:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Histórico de conversação"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Adicionar esta sala aos marcadores"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Navegar"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2074
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Apelido:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1305
-#: ../src/disco.py:1749
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Servidor:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Adicionar esta sala aos marcadores"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Ingressar"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Gerenciar contas"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Ingresso automático"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Gerenciar marcadores"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimizar ao entrar automaticamente"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Imprimir status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1757
-msgid "Server:"
-msgstr "Servidor:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Título:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Configuração do serviço PEP"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Configurar"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Propriedades</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Configurações</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Gerenciar perfis de proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Máqu_ina Proxy:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "_Porta do máquina:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Usar prox_y HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Usar aut_enticação de proxy"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "URL _BOSH:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Nome:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Tipo:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "Nome de _usuário:"
 
-#. # means number
-#: ../data/glade/message_window.glade.h:1 ../src/dialogs.py:3988
-msgid "#"
-msgstr "#"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "*"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:3
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "1"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-msgid "2"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:6
-msgid "3"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:7
-msgid "4"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-msgid "5"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:9
-msgid "6"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:10
-msgid "7"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:11
-msgid "8"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "9"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Adicionar este contato para a lista (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:14
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Adicionar esta sala aos marcadores (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:15
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Pesquisar o histórico de conversas (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:16
-msgid "Change the room's subject (Alt+T)"
-msgstr "Alterar o assunto da sala (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:17
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Alterar o seu apelido (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:18
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Convidar contatos para a conversa (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:19
-msgid "Mic volume:"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:20
-msgid "Send a file (Ctrl+F)"
-msgstr "Enviar um arquivo (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:21
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Exibe uma lista de emoticons (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:22
-msgid "Show a list of formattings"
-msgstr "Exibe uma lista de formatações"
-
-#: ../data/glade/message_window.glade.h:23
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Exibir um menu com funções avançadas (Alt+D)"
-
-#: ../data/glade/message_window.glade.h:24
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Exibir o perfil do contato (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:25
-msgid "Sound volume:"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:26
-msgid "Toggle audio session"
-msgstr "Alternar sessão de áudio"
-
-#: ../data/glade/message_window.glade.h:27
-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/glade/message_window.glade.h:29
-#: ../data/glade/xml_console_window.glade.h:17
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Enviar"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Editor de configurações avançadas</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Aplicações</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
 #, fuzzy
 msgid "<b>Audio</b>"
 msgstr "<b>Ações</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Status automático</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Aparência da conversa</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Cores da linha da conversa</b>"
 
-#: ../data/glade/preferences_window.glade.h:7
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notificações do estado da conversa</b>"
 
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:8
 #, fuzzy
 msgid "<b>Connection</b>"
 msgstr "<b>Condições</b>"
 
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Customizar</b>"
 
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Fonte</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Opções do GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Mensagens de status disponíveis</b>"
 
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Privacidade</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Aparência da lista</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Mensagens de status</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Tema</b>"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:20
 #, fuzzy
 msgid "<b>Video</b>"
 msgstr "<b>Nome do meio:</b>"
 
-#: ../data/glade/preferences_window.glade.h:21
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Notificações visuais</b>"
 
-#: ../data/glade/preferences_window.glade.h:22
+#: ../data/gui/preferences_window.ui.h:22
 msgid "<i>(example: stunserver.org)</i>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:23
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Avançado..."
 
-#: ../data/glade/preferences_window.glade.h:25
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Todos os status de conversa\n"
-"Escrevendo somente\n"
-"Desabilitado"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Totos os status"
 
-#: ../data/glade/preferences_window.glade.h:28
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO"
 
-#: ../data/glade/preferences_window.glade.h:29
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:30
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:31
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Permitir som quando eu estiver _ocupado"
 
-#: ../data/glade/preferences_window.glade.h:32
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Afastado"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Sempre usar as aplicações padrões do OS/X"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Sempre usar as aplicações padrões do OS/X"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Sempre usar as aplicações padrões do OS/X"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Solicite uma mensagem de status quanto eu:"
 
-#: ../data/glade/preferences_window.glade.h:33 ../src/features_window.py:108
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
 msgid "Audio / Video"
 msgstr "Áudio / Vídeo"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:36
 msgid "Audio input device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:37
 msgid "Audio output device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:36
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
-msgstr ""
-"Auto-detectar a cada inicialização do Gajim\n"
-"Sempre usar aplicações no padrão GNOME\n"
-"Sempre usar aplicações no padrão KDE\n"
-"Sempre usar aplicações no padrão Xfce\n"
-"Personalizar"
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "C_onectar na inicialização do Gajim"
 
-#: ../data/glade/preferences_window.glade.h:41
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Mensagem da conversa:"
 
-#: ../data/glade/preferences_window.glade.h:42
+#: ../data/gui/preferences_window.ui.h:40
 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/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Escrevendo"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Configurar cores e fontes da interface"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:43
 msgid "Contact's message:"
 msgstr "Mensagem do contato:"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:44
 msgid "Contact's nickname:"
 msgstr "Apelido do contato:"
 
-#: ../data/glade/preferences_window.glade.h:46
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Personalizar"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
 msgstr ""
-"Lista separada com conversas separadas\n"
-"Lista separada com conversa simples\n"
-"Janela simples para tudo\n"
-"Lista separada com conversas agrupadas por conta\n"
-"Lista separada com conversas agrupadas por tipo"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Desabilitado"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Exibir a_tividade dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:52
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Exibir detalhes _extras dos emails"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:53
 #, fuzzy
 msgid "Display _location of contacts in roster"
 msgstr "Exibir hum_or dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Exibir sin_tonia dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Exibir a_vatar dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Exibir hum_or dos contatos na lista"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Exibir _mensagem de status da lista de contato"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../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 "
@@ -1978,7 +1746,7 @@ msgstr ""
 "que você pode ter com um contato. Aqui você pode especificar quais "
 "caracteres você quer para enviar a outra parte."
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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 "
@@ -1988,7 +1756,7 @@ msgstr ""
 "você pode ter com um contato. Aqui você pode especificar quais caracteres "
 "você quer para enviar a outra parte."
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../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"
@@ -1996,11 +1764,11 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se desconectaram"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Esconder todos os botões nas janelas de conversa"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -2008,7 +1776,7 @@ msgstr ""
 "Se marcado, o Gajim irá permitir que os outros detectem qual o sistema "
 "operacional está usando"
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -2016,14 +1784,14 @@ msgstr ""
 "Se marcado, o Gajim também incluirá informação sobre o remetente de novos "
 "emails"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:65
 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/glade/preferences_window.glade.h:66
+#: ../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"
@@ -2031,7 +1799,7 @@ msgstr ""
 "Se marcado, o Gajim irá alterar o status para Não disponível quando o "
 "computador não estiver mais em uso"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -2039,7 +1807,7 @@ msgstr ""
 "Se marcado, Gajim exibirá avatars dos contatos na janela da lista e na "
 "conferência"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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"
@@ -2047,30 +1815,30 @@ msgstr ""
 "Se marcado, Gajim indicará mensagens de status dos contatos sob o nome do "
 "contato na janela da lista e na conferência"
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Se marcado, Gajim irá exibir a atividade dos contatos na janela da lista"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:70
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the location of contacts in the roster window"
 msgstr "Se marcado, Gajim exibirá o humor dos contatos na janela da lista"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:71
 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/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Se marcado, o Gajim irá exibir a sintonia dos contatos na janela da lista"
 
-#: ../data/glade/preferences_window.glade.h:73
+#: ../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 "
@@ -2081,7 +1849,7 @@ msgstr ""
 "através de um clique com o botão direito no campo de entrada, a linguagem "
 "padrão será usada para este contato ou conferência."
 
-#: ../data/glade/preferences_window.glade.h:74
+#: ../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 "
@@ -2091,7 +1859,7 @@ msgstr ""
 "autorizados. Utilize com cuidado, porque isto bloqueia todas as mensagens de "
 "qualquer contato que você não possuir na sua lista"
 
-#: ../data/glade/preferences_window.glade.h:75
+#: ../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 "
@@ -2101,7 +1869,7 @@ msgstr ""
 "favor, note que quando estiver usando criptografia E2E o remote party não "
 "concorda com o registro, então a mensagem não será gravada."
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2109,7 +1877,7 @@ msgstr ""
 "Se marcado, o Gajim irá exibir uma notificação quando um novo email via "
 "GMail for recebido"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../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, "
@@ -2119,7 +1887,7 @@ msgstr ""
 "exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
 "conectado, ausente, ocupado, etc....)"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../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."
@@ -2127,7 +1895,7 @@ msgstr ""
 "Se habilitado, o Gajim não irá perguntar por mensagem de status. A mensagem "
 "padrão especificada será usada neste caso."
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2135,90 +1903,102 @@ msgstr ""
 "Se habilitado, Gajim substituirá o ascii para smilies, como ':)' com a "
 "animação equivalente ou estático emoticons gráfico"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Registrar sessão de conversa _criptografada"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "T_ornar a janela de mensagem compacta"
 
-#: ../data/glade/preferences_window.glade.h:82
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Gere_nciar..."
 
-#: ../data/glade/preferences_window.glade.h:83
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Nunca\n"
-"Somente quando houver eventos pendentes\n"
-"Sempre"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Nunca"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Notificações"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Notifique-me sobre contatos ao _conectar"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Notifique-me sobre contatos ao _desconectar"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notifique-me sobre isto"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Notificar cada nova mensagem do _GMail"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nunca\n"
+"Somente quando houver eventos pendentes\n"
+"Sempre"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Eventos pessoais"
 
-#: ../data/glade/preferences_window.glade.h:91
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Tocar _sons"
 
-#: ../data/glade/preferences_window.glade.h:92
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
-"Exibir em um pop-up\n"
-"Notificar-me sobre isto\n"
-"Mostra apenas na lista"
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Alerta visual"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Preferências"
 
-#: ../data/glade/preferences_window.glade.h:96
+#: ../data/gui/preferences_window.ui.h:94
 msgid ""
 "STUN server hostname. If none given, Gajim will try\n"
 "to discover one from server."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../data/gui/preferences_window.ui.h:96
 #, fuzzy
 msgid "STUN server:"
 msgstr "Servidor:"
 
-#: ../data/glade/preferences_window.glade.h:99
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Mostre somente na _lista"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Exibir na bandeja do sistema:"
 
-#: ../data/glade/preferences_window.glade.h:100
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2226,27 +2006,27 @@ msgstr ""
 "Algumas mensagens podem incluir conteúdo rico (formatação, cores etc). Se "
 "marcado, o Gajim apenas exibirá as mensagens em texto puro."
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Ordena contatos pelo status"
 
-#: ../data/glade/preferences_window.glade.h:104 ../src/config.py:390
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "_Conjunto de ícones de status:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Estilo"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Tema:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2258,7 +2038,7 @@ msgstr ""
 "$S será substituída pela mensagem de status anterior\n"
 "$T será substituída pela mensagem automática de ausência"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../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"
@@ -2270,372 +2050,379 @@ msgstr ""
 "$S irá ser substituída pela mensagem de status anterior\n"
 "$T irá ser substituída pela mensagem de ausência automática"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Usar ícones de _transportes"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Usar o _padrão do sistema"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:116
 msgid "Video input device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:117
 msgid "Video output device"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Quando novo evento é recebido:"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:119
 msgid "Your message:"
 msgstr "Sua mensagem:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:120
 msgid "Your nickname:"
 msgstr "Seu apelido:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Afastado depois:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Exibir notificações de status de conversa:"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Emoticons:"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Gerenciamento de arquivos:"
 
-#: ../data/glade/preferences_window.glade.h:126
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../data/glade/preferences_window.glade.h:127
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore eventos de contatos que não estejam na minha lista"
 
-#: ../data/glade/preferences_window.glade.h:128
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorar conteúdo formatado nas mensagens recebidas"
 
-#: ../data/glade/preferences_window.glade.h:129
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
-#: ../data/glade/preferences_window.glade.h:130
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../data/glade/preferences_window.glade.h:131
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "_Não disponível depois:"
 
-#: ../data/glade/preferences_window.glade.h:132
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: ../data/glade/preferences_window.glade.h:133
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "Voltar para as cores _padrões"
 
-#: ../data/glade/preferences_window.glade.h:134
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Enviar notificações de status de conversa:"
 
-#: ../data/glade/preferences_window.glade.h:135
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Mensagem de status:"
 
-#: ../data/glade/preferences_window.glade.h:136
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "Destaque de _URL:"
 
-#: ../data/glade/preferences_window.glade.h:137
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "Comportamento da jan_ela:"
 
-#: ../data/glade/preferences_window.glade.h:138
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "em uma c_onferência"
 
-#: ../data/glade/preferences_window.glade.h:139
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "na _lista"
 
-#: ../data/glade/preferences_window.glade.h:140
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minutos"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Listas de privacidade:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Adicionar / Editar regra</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Lista de regras</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista de privacidade</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Ativo para esta sessão"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Ativar ao iniciar o programa"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Todos"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Todos (incluindo inscrições)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Negar"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Ordem:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3284
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Lista de privacidade"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "todos por inscrição"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "todos no grupo"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"nenhum\n"
-"ambos\n"
-"de\n"
-"para"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Ambos"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "De"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "um"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "dois"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "para me enviar mensagens"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "para enviar minhas requisições"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "para seu status para mim"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "para ver meu status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../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/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Cidade:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Empresa:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../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/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Departamento:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Complemento:</b>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../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/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Nome completo</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../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/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../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>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../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/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Nome:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Apelido:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../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/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefixo</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:331
+#: ../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>Cargo:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Estado:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Rua:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sufixo</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Sobre"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Clique para definir seu avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Informações pessoais"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Remover conta _somente do Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5240
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5491
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2643,191 +2430,146 @@ msgstr ""
 "<b>alguem@algumacoisa.com</b> gostaria que você <b>adicionasse</b> alguns "
 "contatos em sua lista de contatos."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../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/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Troca de itens na lista de contatos"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Adicionar _contato..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Re_cursos"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Transferência de _arquivos"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Perguntas freqüentes (online)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Ajuda online"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Perfil, A_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Exibir somente _ativos"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Exibir trans_portes"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Exibir desc_onectados"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Exibir _lista"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "Cont_as"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Ações"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "Índi_ces"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1466
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_FAQ"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Preferências"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Sair"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "_Enviar mensagem simples..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Ver"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr ""
 "Por favor aguarde enquanto o formulário de pesquisa está sendo obtido..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Buscar"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Adicionar contato"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5503
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Informações"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1317
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Ir"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registrar para"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "De:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Resposta para esta mensagem"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "E_nviar"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Para:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Enviar & fechar"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_torizar"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2835,200 +2577,190 @@ msgstr ""
 "Negar a autorização do contato, assim ele não poderá saber quando você está "
 "conectado"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Solicitação de inscrição"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Selecione a conta que você quer sincronizar"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sincronizar: selecionar contatos"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Sons mudos"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Enviar _mensagem simples"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Exibir todos _eventos pendentes"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Conferência"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Pergunta:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Cliente:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Tempo do contato:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Recurso:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Inscrição:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Sistema:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Comentários"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Configurar avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Contato"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Informações do contato"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Mais"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Avatar do usuário:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
 #, fuzzy
 msgid "<b>Filter</b>"
 msgstr "<b>Fonte</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Trafégo do Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:3
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Entrada XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:5
-msgid "Enable"
-msgstr "Habilitar"
-
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:4
 msgid "Hide IN stanzas"
 msgstr ""
 
-#: ../data/glade/xml_console_window.glade.h:7
+#: ../data/gui/xml_console_window.ui.h:5
 msgid "Hide IQ stanzas"
 msgstr ""
 
-#: ../data/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:6
 msgid "Hide Message stanzas"
 msgstr ""
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:7
 msgid "Hide OUT stanzas"
 msgstr ""
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:8
 msgid "Hide Presence stanzas"
 msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:12
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
 #. 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/glade/xml_console_window.glade.h:14
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:15
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../data/glade/xml_console_window.glade.h:16
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Alterar conta..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "JID local:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Pessoal"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Um cliente Jabber GTK+"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Cancelar confirmação"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "O serviço enviou dados inválidos"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "O serviço alterou o identificador da sessão."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "O serviço retornou um erro."
 
@@ -3053,7 +2785,7 @@ msgstr "Inteiro"
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Cor"
 
@@ -3190,84 +2922,84 @@ msgstr "Sueco"
 msgid "Chinese (Ch)"
 msgstr "Chinês (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Idioma do corretor ortográfico"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Sublinhado"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Tachado"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Fonte"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Limpar formatação"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Realmente enviar o arquivo?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1426 ../src/chat_control.py:1904
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "Criptografia GPG habilitada"
 
 #. Add to roster
-#: ../src/chat_control.py:1451 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:243 ../src/dialogs.py:1059 ../src/dialogs.py:1971
-#: ../src/dialogs.py:2000 ../src/gui_interface.py:607
+#: ../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:1586 ../src/roster_window.py:1588
-#: ../src/roster_window.py:1908 ../src/roster_window.py:3211
-#: ../src/roster_window.py:3237
+#: ../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
 msgid "Not in Roster"
 msgstr "Fora da lista"
 
-#: ../src/chat_control.py:1495
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Este contato não suporta transferência de arquivo."
 
-#: ../src/chat_control.py:1498
+#: ../src/chat_control.py:1522
 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:1579
+#: ../src/chat_control.py:1611
 #, 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:1766
+#: ../src/chat_control.py:1812
 #, 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:1884 ../src/dialogs.py:4670
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Nenhuma chave GPG atribuída"
 
-#: ../src/chat_control.py:1885
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3275,50 +3007,50 @@ msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Você não poderá "
 "criptografar mensagem com GPG."
 
-#: ../src/chat_control.py:1894
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "Criptografia GPG desabilitada"
 
-#: ../src/chat_control.py:1920
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "A sessão SERÁ gravada"
 
-#: ../src/chat_control.py:1922
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "A sessão NÃO SERÁ gravada"
 
 #. encryption %s active
-#: ../src/chat_control.py:1939
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "está"
 
-#: ../src/chat_control.py:1939
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "NÃO está"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1941
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "será"
 
-#: ../src/chat_control.py:1941
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "NÃO será"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1945
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "e autenticada"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1949
+#: ../src/chat_control.py:1992
 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:1956
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3327,23 +3059,23 @@ msgstr ""
 "Criptografia%(type)s %(status)s ativa %(authenticated)s.\n"
 "Sua conversa %(logged)s está sendo gravada."
 
-#: ../src/chat_control.py:2096
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Negociação da sessão cancelada"
 
-#: ../src/chat_control.py:2105
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Esta sessão está criptografada"
 
-#: ../src/chat_control.py:2108
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " e SERÁ gravada"
 
-#: ../src/chat_control.py:2110
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " e NÃO SERÁ gravada"
 
-#: ../src/chat_control.py:2115
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3351,25 +3083,25 @@ msgstr ""
 "Identidade do contato remoto não verificada. Clique no botão de proteção "
 "para mais detalhes."
 
-#: ../src/chat_control.py:2117
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "Criptografia E2E desabilitada"
 
-#: ../src/chat_control.py:2154 ../src/chat_control.py:2167
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "A seguinte mensagem NÃO estava criptografada"
 
-#: ../src/chat_control.py:2160
+#: ../src/chat_control.py:2203
 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:2432
+#: ../src/chat_control.py:2475
 #, 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:2433
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3377,15 +3109,15 @@ msgstr ""
 "Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
 "será perdida."
 
-#: ../src/chat_control.py:2576 ../src/common/connection_handlers.py:1559
-#: ../src/common/connection_handlers.py:1610
-#: ../src/common/connection_handlers.py:1804
-#: ../src/common/connection_handlers.py:1949 ../src/common/connection.py:433
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Erro na base de dados"
 
-#: ../src/chat_control.py:2577
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3394,7 +3126,7 @@ msgstr ""
 "O arquivo da base de dados (%s) não pode ser lido. Tente repará-lo ou removê-"
 "lo. (todo o histórico será perdido)."
 
-#: ../src/chat_control.py:2815
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s agora está %(status)s"
@@ -3403,23 +3135,33 @@ msgstr "%(name)s agora está %(status)s"
 msgid "creating logs database"
 msgstr "criando banco de dados de logs"
 
-#: ../src/common/check_paths.py:122 ../src/common/check_paths.py:133
-#: ../src/common/check_paths.py:140
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "criando banco de dados de logs"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:123 ../src/common/check_paths.py:134
-#: ../src/common/check_paths.py:141 ../src/common/check_paths.py:149
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
-#: ../src/common/check_paths.py:148
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:164
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "criando diretório %s"
@@ -3483,9 +3225,9 @@ msgstr "Selecione as salas das quais você quer sair"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:212 ../src/common/contacts.py:137
-#: ../src/common/helpers.py:55 ../src/roster_window.py:813
-#: ../src/roster_window.py:1590 ../src/roster_window.py:1592
-#: ../src/roster_window.py:5132
+#: ../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
 msgid "Groupchats"
 msgstr "Salas"
 
@@ -3594,9 +3336,9 @@ msgstr ""
 "Lista (separada por espaços) de linhas (contas e grupos) que estão agrupados."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:493
-#: ../src/common/optparser.py:285 ../src/common/optparser.py:481
-#: ../src/common/optparser.py:515 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "padrão"
 
@@ -4189,23 +3931,23 @@ msgstr ""
 "Quando a linha de auto contatos é exibida. Pode ser \"sempre\", "
 "\"quando_em_outro_recurso\" ou \"nunca\""
 
-#: ../src/common/config.py:280
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:283
 msgid "STUN server to use when using jingle"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:284
 msgid ""
 "If True, Gajim will show affiliation of groupchat occupants by adding a "
 "colored square to the status icon"
 msgstr ""
 
-#: ../src/common/config.py:294
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4213,7 +3955,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:302
+#: ../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"
@@ -4222,40 +3964,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:303
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Se habilitado, restaura o último status que foi usado."
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:307
 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:306
+#: ../src/common/config.py:308
 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:309
+#: ../src/common/config.py:311
 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:311
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Habilitar criptografia ESessions para esta conta."
 
-#: ../src/common/config.py:312
+#: ../src/common/config.py:314
 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:313
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4263,30 +4005,38 @@ msgstr ""
 "Lista ordenada de tipos de conexão (separada por espaço) para tentar. Pode "
 "conter tls, ssl ou simples"
 
-#: ../src/common/config.py:314
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
 "texto puro."
 
-#: ../src/common/config.py:315
+#: ../src/common/config.py:317
 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:317
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Exibir uma mensagem de alerta antes de enviar uma senha em uma conexão de "
+"texto puro."
+
+#: ../src/common/config.py:320
 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:326
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Espaço em branco enviado após inatividade"
 
-#: ../src/common/config.py:327
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "Ping XMPP enviado após inatividade"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4295,11 +4045,11 @@ msgstr ""
 "tentar reconectar."
 
 #. yes, no, ask
-#: ../src/common/config.py:335
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 rodando"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4307,15 +4057,15 @@ msgstr ""
 "Se checado, o Gaijm usará seu IP e proxies definidos no "
 "file_transfer_proxies, em opções para transferência de arquivos."
 
-#: ../src/common/config.py:352
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Respostas para requisições recebidas"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Requisições recebidas enviadas"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4323,11 +4073,16 @@ msgstr ""
 "Ao negociar uma sessão criptografada, o Gajim deve assumir que você quer que "
 "suas mensagens sejam gravadas?"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "O OpenPGP está ativado para este contato?"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4335,101 +4090,101 @@ msgstr ""
 "O Gajim deve iniciar automaticamente uma sessão criptografada com este "
 "contato quando possível?"
 
-#: ../src/common/config.py:429 ../src/common/config.py:432
+#: ../src/common/config.py:433 ../src/common/config.py:436
 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:438
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "todos ou lista de status separados por espaço"
 
-#: ../src/common/config.py:439
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'sim', 'não' ou 'ambos'"
 
-#: ../src/common/config.py:440 ../src/common/config.py:442
-#: ../src/common/config.py:443 ../src/common/config.py:446
-#: ../src/common/config.py:447
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'sim', 'não', ou ''"
 
-#: ../src/common/config.py:453 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:454
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:454
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:455 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:455
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:456
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:456
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:457 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Estou fora curtindo a vida."
 
-#: ../src/common/config.py:470
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Estou disponível."
 
-#: ../src/common/config.py:471
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Estou livre para conversar."
 
-#: ../src/common/config.py:472 ../src/config.py:1572
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Estou de volta."
 
-#: ../src/common/config.py:473
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Não estou disponível."
 
-#: ../src/common/config.py:474
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Não perturbe."
 
-#: ../src/common/config.py:475 ../src/common/config.py:476
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Tchau!"
 
-#: ../src/common/config.py:486
+#: ../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."
@@ -4437,23 +4192,23 @@ 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:487
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Som a ser tocado quando qualquer mensagem MUC chegar."
 
-#: ../src/common/config.py:496 ../src/common/optparser.py:299
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:500 ../src/common/optparser.py:285
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:504
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:508
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marinho"
 
@@ -4476,50 +4231,50 @@ msgstr "Registro realizado com sucesso"
 msgid "Registration with agent %s succeeded"
 msgstr "Registro com o agente %s completado com sucesso"
 
-#: ../src/common/connection_handlers.py:127
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Falha ao registrar"
 
-#: ../src/common/connection_handlers.py:127
+#: ../src/common/connection_handlers.py:133
 #, 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:430
-#: ../src/common/connection_handlers.py:1557
-#: ../src/common/connection_handlers.py:1608
-#: ../src/common/connection_handlers.py:1802
-#: ../src/common/connection_handlers.py:1947 ../src/common/connection.py:431
-#: ../src/gajim.py:353
+#: ../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
 msgid "Disk Write Error"
 msgstr "Erro de escrita em disco"
 
-#: ../src/common/connection_handlers.py:653 ../src/common/connection.py:1437
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Sem suporte a invisibilidade"
 
-#: ../src/common/connection_handlers.py:654 ../src/common/connection.py:1438
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "A conta %s não suporta invisibilidade."
 
-#: ../src/common/connection_handlers.py:1377 ../src/common/connection.py:246
-#: ../src/config.py:2034 ../src/config.py:2043 ../src/config.py:2102
-#: ../src/config.py:3456 ../src/dataforms_widget.py:577 ../src/dialogs.py:2778
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID inválido:"
 
-#: ../src/common/connection_handlers.py:1378
+#: ../src/common/connection_handlers.py:1398
 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:1560
-#: ../src/common/connection_handlers.py:1611
-#: ../src/common/connection_handlers.py:1805
-#: ../src/common/connection_handlers.py:1950 ../src/common/connection.py:434
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4529,7 +4284,7 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) ou removê-lo (todo o histórico "
 "será perdido)."
 
-#: ../src/common/connection_handlers.py:1657
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Apelido não permitido: %s"
@@ -4537,76 +4292,76 @@ msgstr "Apelido não permitido: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1752
-#: ../src/common/connection_handlers.py:1760
-#: ../src/common/connection_handlers.py:1766
-#: ../src/common/connection_handlers.py:1769
-#: ../src/common/connection_handlers.py:1772
-#: ../src/common/connection_handlers.py:1776 ../src/gui_interface.py:129
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Impossível ingressar na sala"
 
-#: ../src/common/connection_handlers.py:1753
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Número máximo de usuários para %s foi atingido"
 
-#: ../src/common/connection_handlers.py:1761
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Você está banido da sala %s."
 
-#: ../src/common/connection_handlers.py:1767
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "A sala %s não existe."
 
-#: ../src/common/connection_handlers.py:1770
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "A criação de sala é restrita."
 
-#: ../src/common/connection_handlers.py:1773
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Seu nickname registado deve ser usado na sala %s."
 
-#: ../src/common/connection_handlers.py:1777
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Você não está na lista de membros da sala %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1820
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "A sala foi excluída"
 
-#: ../src/common/connection_handlers.py:1828
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Você pode entrar nessa sala ao invés: %s"
 
-#: ../src/common/connection_handlers.py:1859
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adiciona-lo à minha lista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1880
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nós estamos agora inscritos para %s"
 
-#: ../src/common/connection_handlers.py:1882
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "remoção de inscrição solicitada por %s"
 
-#: ../src/common/connection_handlers.py:1884
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nós estamos agora sem inscrição para %s"
 
-#: ../src/common/connection_handlers.py:2079
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4744,27 +4499,27 @@ msgstr "O uso das chaves não inclui assinatura de certificado"
 msgid "Application verification failure"
 msgstr "Verificação do aplicativo falhou"
 
-#: ../src/common/connection.py:247 ../src/dialogs.py:2779
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:269
+#: ../src/common/connection.py:271
 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:272
+#: ../src/common/connection.py:274
 #, 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:320
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Esta mensagem está *criptografada* (Veja :XEP:`27`)]"
 
-#: ../src/common/connection.py:421
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4773,80 +4528,80 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:771
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:772
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Reconecte manualmente."
 
-#: ../src/common/connection.py:784
+#: ../src/common/connection.py:802
 #, 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:818
+#: ../src/common/connection.py:836
 #, 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:831
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Erro de SSL desconhecido: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:846
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Resposta inválida"
 
-#: ../src/common/connection.py:847
+#: ../src/common/connection.py:865
 #, 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:1128 ../src/common/connection.py:1257
-#: ../src/common/connection.py:1748
-#: ../src/common/zeroconf/connection_zeroconf.py:191
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:1129 ../src/gui_interface.py:701
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/common/connection.py:1134
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "O servidor respondeu: %s"
 
-#: ../src/common/connection.py:1147
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Falha na conexão com o proxy"
 
-#: ../src/common/connection.py:1178 ../src/common/connection.py:1237
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Não foi possível conectar a conta %s"
 
-#: ../src/common/connection.py:1179 ../src/common/connection.py:1238
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1204
+#: ../src/common/connection.py:1222
 #, 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:1207
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4855,7 +4610,7 @@ msgstr ""
 "\n"
 "Erro de SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1209
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4864,24 +4619,24 @@ msgstr ""
 "\n"
 "Erro de SSL desconhecido: %d"
 
-#: ../src/common/connection.py:1258
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1289
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1291
+#: ../src/common/connection.py:1309
 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:1360
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Erro ao remover lista de privacidade"
 
-#: ../src/common/connection.py:1361
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4890,43 +4645,43 @@ 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:1614
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Enviar contato: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1617
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Enviar contatos:"
 
-#: ../src/common/connection.py:1782 ../src/common/connection.py:1805
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Não baixado por causa do status invisível"
 
-#: ../src/common/connection.py:2208
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Falha ao cancelar registro"
 
-#: ../src/common/connection.py:2209
+#: ../src/common/connection.py:2220
 #, 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:55
-#: ../src/gui_interface.py:607
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Observadores"
 
-#: ../src/common/contacts.py:139 ../src/common/contacts.py:363
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1463 ../src/gui_interface.py:412
-#: ../src/roster_window.py:852 ../src/roster_window.py:1511
-#: ../src/roster_window.py:1582 ../src/roster_window.py:1584
-#: ../src/roster_window.py:1742
+#: ../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
 msgid "Transports"
 msgstr "Transportes"
 
-#: ../src/common/contacts.py:371
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Fora da lista"
 
@@ -4935,15 +4690,25 @@ msgstr "Fora da lista"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 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
+#, 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
+#, 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"
+
 #: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "A base de dados não pôde ser lida."
@@ -5140,245 +4905,249 @@ msgstr "Fim da semana"
 msgid "Weekend!"
 msgstr "Final de semana!"
 
-#: ../src/common/helpers.py:149
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Caracter inválido no nome do usuário."
 
-#: ../src/common/helpers.py:154
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Endereço do servidor é requerido."
 
-#: ../src/common/helpers.py:160
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Caracter inválido no nome do host."
 
-#: ../src/common/helpers.py:167
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Caracter inválido no recurso."
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Ocupado"
 
-#: ../src/common/helpers.py:209
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../src/common/helpers.py:212
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Não disponível"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "Livre para _conversa"
 
-#: ../src/common/helpers.py:219
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Livre para conversa"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "Dis_ponível"
 
-#: ../src/common/helpers.py:224 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Disponível"
 
-#: ../src/common/helpers.py:226
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Afastado"
 
-#: ../src/common/helpers.py:234
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Desconectado"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Desconectado"
 
-#: ../src/common/helpers.py:239
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Invisível"
 
-#: ../src/common/helpers.py:245
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
 
-#: ../src/common/helpers.py:247
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?contato tem status:Com erros"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Inscrição existente:Nenhuma"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Para"
 
-#: ../src/common/helpers.py:258
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Ambos"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Pergunta (para inscrição):Nenhuma"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Inscrever"
 
-#: ../src/common/helpers.py:277
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Regra do contato para conversa em grupo:Nenhuma"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderadores"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderador"
 
-#: ../src/common/helpers.py:285
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Participantes"
 
-#: ../src/common/helpers.py:287
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Participante"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Visitantes"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Visitante"
 
-#: ../src/common/helpers.py:298
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Filiação do contato de conferência:Nenhuma"
 
-#: ../src/common/helpers.py:300
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Dono"
 
-#: ../src/common/helpers.py:302
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrador"
 
-#: ../src/common/helpers.py:304
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Membro"
 
-#: ../src/common/helpers.py:343
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "está prestando a atenção na conversa"
 
-#: ../src/common/helpers.py:345
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "está fazendo outra coisa"
 
-#: ../src/common/helpers.py:347
+#: ../src/common/helpers.py:349
 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:350
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "parou de digitar"
 
-#: ../src/common/helpers.py:352
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:617
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:620
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:624
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:627
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:631
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:634
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:637
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1112
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1118
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " da sala %s"
 
-#: ../src/common/helpers.py:1121 ../src/common/helpers.py:1140
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " do usuário %s"
 
-#: ../src/common/helpers.py:1123
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " de %s"
 
-#: ../src/common/helpers.py:1130 ../src/common/helpers.py:1137
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, 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:1170
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/jingle_rtp.py:102
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
 #, fuzzy, python-format
 msgid "%s configuration error"
 msgstr "Configuração da sala"
 
-#: ../src/common/jingle_rtp.py:103
+#: ../src/common/jingle_rtp.py:107
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -5390,19 +5159,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:289
+#: ../src/common/jingle_rtp.py:299
 msgid "audio input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:292
+#: ../src/common/jingle_rtp.py:302
 msgid "audio output"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:321
+#: ../src/common/jingle_rtp.py:331
 msgid "video input"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:329
+#: ../src/common/jingle_rtp.py:339
 msgid "video output"
 msgstr ""
 
@@ -5416,13 +5185,13 @@ msgstr "Erro executando \"%(command)s\": %(error)s"
 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:36
+#: ../src/common/multimedia_helpers.py:37
 #, fuzzy
 msgid " Default device"
 msgstr "Mensagem padrão"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:52
+#: ../src/common/multimedia_helpers.py:53
 #, fuzzy
 msgid "Audio test"
 msgstr "Áudio / Vídeo"
@@ -5430,62 +5199,61 @@ msgstr "Áudio / Vídeo"
 #. Auto src
 #. Auto sink
 #. Auto src
-#. Auto sink
-#: ../src/common/multimedia_helpers.py:55
-#: ../src/common/multimedia_helpers.py:68
-#: ../src/common/multimedia_helpers.py:81
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:56
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:82
+#: ../src/common/multimedia_helpers.py:99
 msgid "Autodetect"
 msgstr ""
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:70
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
 #, fuzzy, python-format
 msgid "ALSA: %s"
 msgstr "Tamanho: %s"
 
 #. Fake sink
 #. Fake video output
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:78
+#: ../src/common/multimedia_helpers.py:79
 msgid "Video test"
 msgstr ""
 
-#. V4L2 src ; TODO: Figure out why it doesn't work
-#: ../src/common/multimedia_helpers.py:83
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
 #, python-format
 msgid "V4L2: %s"
 msgstr ""
 
-#. xvimage sink
-#: ../src/common/multimedia_helpers.py:97
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr ""
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:99
+#: ../src/common/multimedia_helpers.py:98
 msgid "X Window System (without Xv)"
 msgstr ""
 
 #. we talk about a file
-#: ../src/common/optparser.py:52
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
-#: ../src/common/optparser.py:294 ../src/common/optparser.py:295
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "azul celeste"
 
-#: ../src/common/optparser.py:374
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migrando base de dados de registros para índices"
 
@@ -6166,11 +5934,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:180
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Erro do Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -6179,44 +5947,44 @@ msgstr ""
 "%s\n"
 "Mensagens link-local podem não funcionar adequadamente."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 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:201
-#: ../src/common/zeroconf/connection_zeroconf.py:205
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Impossível iniciar o serviço local"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Impossível conectar-se à porta %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:206
-#: ../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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 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:284
-#: ../src/common/zeroconf/connection_zeroconf.py:295
-#: ../src/common/zeroconf/connection_zeroconf.py:309
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Impossível alterar status da conta \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:326
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 msgid "Your message could not be sent."
 msgstr "Sua mensagem não pode ser enviada."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:336
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 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:361
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -6229,24 +5997,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Erro ao adicionar serviço. %s"
 
-#: ../src/config.py:169 ../src/config.py:652
-msgid "Disabled"
-msgstr "Desabilitado"
-
-#: ../src/config.py:396
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Mensagem padrão"
 
-#: ../src/config.py:405
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Habilitado"
 
-#: ../src/config.py:720 ../src/dialogs.py:1363
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, 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:721
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6255,67 +6019,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:1187
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:1187
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
 #. Name column
-#: ../src/config.py:1488 ../src/dialogs.py:2231 ../src/dialogs.py:2297
-#: ../src/dialogs.py:3063 ../src/disco.py:830 ../src/disco.py:1689
-#: ../src/disco.py:1991 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1581
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Re-autenticar agora?"
 
-#: ../src/config.py:1582
+#: ../src/config.py:1586
 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:1714 ../src/config.py:1839
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1879 ../src/config.py:1923
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Eventos não lidos"
 
-#: ../src/config.py:1880
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Ler todos os eventos pendentes antes de remover esta conta."
 
-#: ../src/config.py:1906
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Você iniciou uma conversa usando a conta %s"
 
-#: ../src/config.py:1907
+#: ../src/config.py:1918
 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:1919 ../src/config.py:2442 ../src/config.py:2478
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1920
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar desconectado."
 
-#: ../src/config.py:1924
+#: ../src/config.py:1935
 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:1930
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Nome de conta já está em uso"
 
-#: ../src/config.py:1931
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6323,146 +6087,146 @@ msgstr ""
 "Este nome já está sendo usado por outra de suas contas. Por favor, escolha "
 "outro nome."
 
-#: ../src/config.py:1935 ../src/config.py:1939
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1940
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:2015
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Renomear conta"
 
-#: ../src/config.py:2016
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Entre com um novo nome para a conta %s"
 
-#: ../src/config.py:2044
+#: ../src/config.py:2055
 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:2252 ../src/config.py:3502
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:2253 ../src/config.py:3503
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:2274
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:2275
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Não há chave secreta OpenPGP disponível."
 
-#: ../src/config.py:2309
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Seleção de chave OpenPGP"
 
-#: ../src/config.py:2310
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:2317
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:2318
+#: ../src/config.py:2329
 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:2325 ../src/dialogs.py:2029 ../src/dialogs.py:2219
-#: ../src/dialogs.py:2404 ../src/disco.py:476 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:2326
+#: ../src/config.py:2337
 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:2330
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Seu servidor não suporta Vcard"
 
-#: ../src/config.py:2331
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Seu servidor não pode salvar suas informações pessoais."
 
-#: ../src/config.py:2443 ../src/config.py:2479
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "Para desativar esta conta, você deve estar desconectado."
 
-#: ../src/config.py:2448
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Conta local já existe."
 
-#: ../src/config.py:2449
+#: ../src/config.py:2461
 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:2606
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:2608
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
 #. list at the beginning
-#: ../src/config.py:2644
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Lista de banidos"
 
-#: ../src/config.py:2645
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Lista de membros"
 
-#: ../src/config.py:2646
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Lista de proprietários"
 
-#: ../src/config.py:2647
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Lista de administradores"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2696 ../src/disco.py:837 ../src/history_manager.py:201
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2706
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Razão"
 
-#: ../src/config.py:2713
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Apelido"
 
-#: ../src/config.py:2719
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Cargo"
 
-#: ../src/config.py:2746
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Banindo..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2748
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6470,11 +6234,11 @@ msgstr ""
 "<b>Quem você quer banir?</b>\n"
 "\n"
 
-#: ../src/config.py:2750
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Adicionando membro..."
 
-#: ../src/config.py:2751
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6482,11 +6246,11 @@ msgstr ""
 "<b>Quem você quer fazer como membro?</b>\n"
 "\n"
 
-#: ../src/config.py:2753
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Adicionando proprietário..."
 
-#: ../src/config.py:2754
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6494,11 +6258,11 @@ msgstr ""
 "<b>Quem você quer tornar um proprietário?</b>\n"
 "\n"
 
-#: ../src/config.py:2756
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Adicionando administrador..."
 
-#: ../src/config.py:2757
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6506,7 +6270,7 @@ msgstr ""
 "<b>Quem você quer tornar um administrador?</b>\n"
 "\n"
 
-#: ../src/config.py:2758
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6522,59 +6286,87 @@ 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:2859
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2881 ../src/gui_interface.py:1104
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Emoticons desabilitados"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2882 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2883 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2892
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2893
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2991
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Falha na conexão com o proxy"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "O que você quer fazer?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Remover conta _somente do Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Padrão"
 
-#: ../src/config.py:2991
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?exibir_status:Todos"
 
-#: ../src/config.py:2992
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Apenas entre e saia"
 
-#: ../src/config.py:2993
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?exibir_status:Nenhum"
 
-#: ../src/config.py:3063
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Nova conferência"
 
-#: ../src/config.py:3096
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tem dados inválidos"
 
-#: ../src/config.py:3097
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6582,27 +6374,27 @@ msgstr ""
 "este marcador."
 
 #. invalid char
-#: ../src/config.py:3215 ../src/dialogs.py:1827
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Apelido inválido"
 
-#: ../src/config.py:3216 ../src/config.py:3230 ../src/config.py:3244
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Caractere não permitido"
 
-#: ../src/config.py:3229 ../src/config.py:3478
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Servidor inválido"
 
-#: ../src/config.py:3243
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Sala inválida"
 
-#: ../src/config.py:3395
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:3396 ../src/config.py:3402
+#: ../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 "
@@ -6612,34 +6404,34 @@ msgstr ""
 "avançado, ou mais tarde clicando em contas no menu editar da janela "
 "principal."
 
-#: ../src/config.py:3401
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:3439
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:3441
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:3479
+#: ../src/config.py:3525
 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:3535 ../src/gui_interface.py:1852
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Certificado já está no arquivo"
 
-#: ../src/config.py:3536 ../src/gui_interface.py:1853
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3606
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6654,7 +6446,7 @@ msgstr ""
 "Erro do SSL: %(error)s\n"
 "Você ainda quer conectar com este servidor?"
 
-#: ../src/config.py:3612 ../src/gui_interface.py:1877
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6665,63 +6457,63 @@ msgstr ""
 "SHA1 fingerprint do certificado:\n"
 "%s"
 
-#: ../src/config.py:3639 ../src/config.py:3666
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:3733
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:3734
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/config.py:3887
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:3895
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:3930
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Primeira mensagem recebida"
 
-#: ../src/config.py:3931
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Nova mensagem recebida com foco"
 
-#: ../src/config.py:3933
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Nova mensagem recebida sem foco"
 
-#: ../src/config.py:3934
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Contato conectado"
 
-#: ../src/config.py:3935
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Contato desconectou"
 
-#: ../src/config.py:3936
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Mensagem enviada"
 
-#: ../src/config.py:3937
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Mensagem destacada de conferência"
 
-#: ../src/config.py:3938
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Mensagem de conferência recebida"
 
-#: ../src/config.py:3939
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Email do GMail recebido"
 
-#: ../src/conversation_textview.py:598
+#: ../src/conversation_textview.py:599
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
@@ -6731,7 +6523,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:617
+#: ../src/conversation_textview.py:618
 msgid ""
 "Text below this line is what has been said since the\n"
 "last time you paid attention to this group chat"
@@ -6739,44 +6531,44 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde a\n"
 "última vez onde você prestou a atenção a conferência"
 
-#: ../src/conversation_textview.py:736
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Frase"
 
-#: ../src/conversation_textview.py:743
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Ações para \"%s\""
 
-#: ../src/conversation_textview.py:755
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Ler artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:760
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _dicionário"
 
-#: ../src/conversation_textview.py:777
+#: ../src/conversation_textview.py:779
 #, 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:790
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de procura na web não existe \"%s\""
 
-#: ../src/conversation_textview.py:793
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Procura na web por isto"
 
-#: ../src/conversation_textview.py:799
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Abrir como _link"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1285
+#: ../src/conversation_textview.py:1292
 #, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6784,7 +6576,7 @@ msgstr[0] "Ontem"
 msgstr[1] "Há %i dias"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1320 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -6807,150 +6599,150 @@ msgstr "novo@jabber.id"
 msgid "new%d@jabber.id"
 msgstr "novo%d@jabber.id"
 
-#: ../src/dialogs.py:80
+#: ../src/dialogs.py:81
 #, python-format
 msgid "Contact name: <i>%s</i>"
 msgstr "Nome do contato: <i>%s</i>"
 
-#: ../src/dialogs.py:82
+#: ../src/dialogs.py:83
 #, python-format
 msgid "Jabber ID: <i>%s</i>"
 msgstr "Jabber ID: <i>%s</i>"
 
-#: ../src/dialogs.py:193
+#: ../src/dialogs.py:194
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:200
+#: ../src/dialogs.py:201
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:291
+#: ../src/dialogs.py:292
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:296
+#: ../src/dialogs.py:297
 msgid "Contact name"
 msgstr "Nome do contato"
 
-#: ../src/dialogs.py:468
+#: ../src/dialogs.py:469
 msgid "Set Mood"
 msgstr "Definir humor"
 
-#: ../src/dialogs.py:588
+#: ../src/dialogs.py:589
 #, python-format
 msgid "%s Status Message"
 msgstr "%s mensagem de status"
 
-#: ../src/dialogs.py:602
+#: ../src/dialogs.py:603
 msgid "Status Message"
 msgstr "Mensagem de status"
 
-#: ../src/dialogs.py:792
+#: ../src/dialogs.py:793
 msgid "Overwrite Status Message?"
 msgstr "Sobrescrever mensagem de status?"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:794
 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:801
+#: ../src/dialogs.py:802
 msgid "Save as Preset Status Message"
 msgstr "Salvar como a mensagem de status pré-configurada"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:803
 msgid "Please type a name for this status message"
 msgstr "Por favor, escreva um nome para esta mensagem de status"
 
-#: ../src/dialogs.py:830
+#: ../src/dialogs.py:831
 msgid "AIM Address:"
 msgstr "Endereço AIM:"
 
-#: ../src/dialogs.py:831
+#: ../src/dialogs.py:832
 msgid "GG Number:"
 msgstr "Número de GG:"
 
-#: ../src/dialogs.py:832
+#: ../src/dialogs.py:833
 msgid "ICQ Number:"
 msgstr "Número de ICQ:"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:834
 msgid "MSN Address:"
 msgstr "Endereço MSN:"
 
-#: ../src/dialogs.py:834
+#: ../src/dialogs.py:835
 msgid "Yahoo! Address:"
 msgstr "Endereço Yahoo!:"
 
-#: ../src/dialogs.py:871
+#: ../src/dialogs.py:872
 #, 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:873
+#: ../src/dialogs.py:875
 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:1034 ../src/dialogs.py:1040 ../src/dialogs.py:1045
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Inválido ID do usuário"
 
-#: ../src/dialogs.py:1041
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "O ID do usuário não contém um recurso."
 
-#: ../src/dialogs.py:1046
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Você não pode adicionar você mesmo na sua lista."
 
-#: ../src/dialogs.py:1060
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Contato já foi adicionado à lista"
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Este contato já encontra-se em sua lista."
 
-#: ../src/dialogs.py:1097
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ID do usuário:"
 
-#: ../src/dialogs.py:1158
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Versão do GTK+:"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Versão do PyGTK:"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Desenvolvedores atuais:"
 
-#: ../src/dialogs.py:1172
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Desenvolvedores passados:"
 
-#: ../src/dialogs.py:1178
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "AGRADECIMENTOS:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1184
+#: ../src/dialogs.py:1201
 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:1196
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br>\n"
@@ -6958,7 +6750,7 @@ msgstr ""
 "Djavan Fagundes <djavan@comum.org>\n"
 "Og Maciel <og.maciel@gmail.com>"
 
-#: ../src/dialogs.py:1364
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6971,100 +6763,100 @@ msgstr ""
 "\n"
 "O recurso de destacar palavras grafadas incorretamente não será usado"
 
-#: ../src/dialogs.py:1828 ../src/dialogs.py:2170
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "O apelido possui caracteres não permitidos."
 
-#: ../src/dialogs.py:1946
+#: ../src/dialogs.py:2044
 #, 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:1949
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:2024 ../src/gui_interface.py:2591
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Você já está na conferência %s"
 
-#: ../src/dialogs.py:2030
+#: ../src/dialogs.py:2128
 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:2072
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:2159
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Conta inválida"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2301
 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:2169
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Apelido inválido"
 
-#: ../src/dialogs.py:2174 ../src/dialogs.py:2180
-#: ../src/groupchat_control.py:1762
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Jabber ID da conferência inválido:"
 
-#: ../src/dialogs.py:2175
+#: ../src/dialogs.py:2318
 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:2181 ../src/groupchat_control.py:1763
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "O Jabber ID da conferência possui caracteres não permitidos."
 
-#: ../src/dialogs.py:2188
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Isto não é uma conferência"
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s não é o nome da conferência."
 
-#: ../src/dialogs.py:2220
+#: ../src/dialogs.py:2363
 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:2234
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/dialogs.py:2269
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Esta conta não está conectada ao servidor"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2413
 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:2294
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Sincronizar"
 
-#: ../src/dialogs.py:2354
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:2356
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -7073,168 +6865,168 @@ msgstr ""
 "você quer enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2383 ../src/dialogs.py:2764 ../src/dialogs.py:2978
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2765 ../src/dialogs.py:2979
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, 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:2393 ../src/dialogs.py:2396
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "JID inválido:"
 
-#: ../src/dialogs.py:2396
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Impossível gravar o arquivo em \"%s\"."
 
-#: ../src/dialogs.py:2405
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar conectado para mudar sua senha."
 
-#: ../src/dialogs.py:2424
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Senha inválida"
 
-#: ../src/dialogs.py:2424
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:2428
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2573
 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:2466 ../src/notify.py:263 ../src/notify.py:499
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:2468 ../src/notify.py:271 ../src/notify.py:501
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
-#: ../src/dialogs.py:2470 ../src/notify.py:292 ../src/notify.py:344
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nova mensagem"
 
 #. single message
-#: ../src/dialogs.py:2470 ../src/notify.py:275 ../src/notify.py:345
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nova mensagem"
 
 #. private message
-#: ../src/dialogs.py:2471 ../src/notify.py:281 ../src/notify.py:345
-#: ../src/notify.py:504
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Enviar mensagem privada"
 
-#: ../src/dialogs.py:2471 ../src/gui_interface.py:1312 ../src/notify.py:513
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Novo e-mail"
 
-#: ../src/dialogs.py:2473 ../src/gui_interface.py:1375 ../src/notify.py:506
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Solicitação de transferência de arquivos"
 
-#: ../src/dialogs.py:2475 ../src/gui_interface.py:1280
-#: ../src/gui_interface.py:1344 ../src/notify.py:508
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Erro na transferência de arquivos"
 
-#: ../src/dialogs.py:2477 ../src/gui_interface.py:1420
-#: ../src/gui_interface.py:1442 ../src/gui_interface.py:1459
-#: ../src/notify.py:510
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Transferência do arquivo completa"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1423 ../src/notify.py:511
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Transferência do arquivo parada"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1123 ../src/notify.py:515
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Convite para conferência"
 
-#: ../src/dialogs.py:2482 ../src/notify.py:255 ../src/notify.py:517
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "O contato alterou seu status"
 
-#: ../src/dialogs.py:2683
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Mensagem simples usando conta %s"
 
-#: ../src/dialogs.py:2685
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Mensagem simples na conta %s"
 
-#: ../src/dialogs.py:2687
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2713
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Recebido %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2736
+#: ../src/dialogs.py:2880
 #, 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:2815
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2816
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:2874
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:2876
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Console XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:3007
+#: ../src/dialogs.py:3151
 msgid "add"
 msgstr "adicionar"
 
-#: ../src/dialogs.py:3007
+#: ../src/dialogs.py:3151
 msgid "modify"
 msgstr "modificar"
 
-#: ../src/dialogs.py:3008
+#: ../src/dialogs.py:3152
 msgid "remove"
 msgstr "remover"
 
-#: ../src/dialogs.py:3036
+#: ../src/dialogs.py:3180
 #, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7244,146 +7036,151 @@ msgstr ""
 "lista."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3052 ../src/dialogs.py:3098
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Adicionar"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3054 ../src/dialogs.py:3129
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../src/dialogs.py:3060
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Deletar"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3066
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupos"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3174
+#: ../src/dialogs.py:3318
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s me sugeriu adicionar você à minha lista."
 
-#: ../src/dialogs.py:3188
+#: ../src/dialogs.py:3332
 #, python-format
 msgid "Added  %s contacts"
 msgstr "Adicionados %s contatos"
 
-#: ../src/dialogs.py:3225
+#: ../src/dialogs.py:3369
 #, python-format
 msgid "Removed  %s contacts"
 msgstr "Removidos %s contatos"
 
-#: ../src/dialogs.py:3278
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista de privacidade <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3282
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3482
 #, 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:3343
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordem: %(order)s, ação: %(action)s"
 
-#: ../src/dialogs.py:3387
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Editar uma regra</b>"
 
-#: ../src/dialogs.py:3498
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Adicionar uma regra</b>"
 
-#: ../src/dialogs.py:3598
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista de privacidade para %s"
 
-#: ../src/dialogs.py:3600
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Listas de privacidade"
 
-#: ../src/dialogs.py:3670
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Nome de lista inválido"
 
-#: ../src/dialogs.py:3671
+#: ../src/dialogs.py:3815
 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:3703
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Você foi convidado para uma conferência"
 
-#: ../src/dialogs.py:3706
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact convidou você para ingressar em uma discussão"
 
-#: ../src/dialogs.py:3708
+#: ../src/dialogs.py:3852
 #, 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:3716
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:3718
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Você quer aceitar este convite?"
 
-#: ../src/dialogs.py:3779
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Escolher som"
 
-#: ../src/dialogs.py:3789 ../src/dialogs.py:3845
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:3794
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:3832
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:3850
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:3917
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Quando %s chega:"
 
-#: ../src/dialogs.py:3919
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Adicionando notificação especial para %s"
 
-#: ../src/dialogs.py:3994
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Condição"
 
-#: ../src/dialogs.py:4114
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "quando eu estiver "
 
-#: ../src/dialogs.py:4590
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7394,19 +7191,19 @@ msgstr ""
 "\n"
 "A String Curta de Autenticação (SAS) da sessão é <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4593
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Você já verificou a identidade deste contato."
 
-#: ../src/dialogs.py:4599 ../src/dialogs.py:4683
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Identidade do contato verificada"
 
-#: ../src/dialogs.py:4605
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Verificar novamente..."
 
-#: ../src/dialogs.py:4610
+#: ../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 "
@@ -7416,19 +7213,19 @@ msgstr ""
 "mensagens e enviar mensagens, você precisa verificar a identidade dela "
 "clicando no botão abaixo."
 
-#: ../src/dialogs.py:4613 ../src/dialogs.py:4664 ../src/dialogs.py:4677
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "A identidade do contato NÃO foi verificada"
 
-#: ../src/dialogs.py:4618
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Verificar..."
 
-#: ../src/dialogs.py:4629
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Você verificou a identidade deste contato?"
 
-#: ../src/dialogs.py:4630
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7443,24 +7240,24 @@ msgstr ""
 "\n"
 "Esta String de  Autenticação Curta é <b>%(sas)s</ b>."
 
-#: ../src/dialogs.py:4631
+#: ../src/dialogs.py:4775
 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:4665
+#: ../src/dialogs.py:4809
 #, 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:4671
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nenhuma chave GPG está atribuída para este contato. Então, você não pode "
 "criptografar mensagens."
 
-#: ../src/dialogs.py:4678
+#: ../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."
@@ -7469,7 +7266,7 @@ msgstr ""
 "nesta chave</b>, então as mensagens <b>não podem</b> ser criptografadas. Use "
 "seu cliente de GPG para validar esta chave."
 
-#: ../src/dialogs.py:4684
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7477,19 +7274,19 @@ msgstr ""
 "A chave GPG está atribuída para este contato, e você validou esta chave, "
 "então as mensagens serão criptografadas."
 
-#: ../src/dialogs.py:4749
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr "um áudio e vídeo"
 
-#: ../src/dialogs.py:4751
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr "um áudio"
 
-#: ../src/dialogs.py:4753
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr "um video"
 
-#: ../src/dialogs.py:4757
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
@@ -7498,33 +7295,33 @@ msgstr ""
 "O %(contact)s quer iniciar uma sessão  %(type)s com você. Você quer "
 "responder a chamada?"
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Outros"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Conferência"
 
-#: ../src/disco.py:477
+#: ../src/disco.py:512
 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:553
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Buscar serviços usando conta %s"
 
-#: ../src/disco.py:555
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Buscar serviços"
 
-#: ../src/disco.py:705
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "O serviço não pode ser encontrado"
 
-#: ../src/disco.py:706
+#: ../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."
@@ -7532,94 +7329,98 @@ 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:710 ../src/disco.py:1046
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Serviço não navegável"
 
-#: ../src/disco.py:711
+#: ../src/disco.py:749
 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:750 ../src/disco.py:760
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Nome do servidor inválido"
 
-#: ../src/disco.py:814
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Explorando %(address)s usando conta %(account)s"
 
-#: ../src/disco.py:858
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Navegar"
 
-#: ../src/disco.py:1047
+#: ../src/disco.py:1085
 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:1287
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Executar comando"
 
-#: ../src/disco.py:1297 ../src/disco.py:1468
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1509
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Varrendo %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1699
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1707
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Descrição"
 
 #. Id column
-#: ../src/disco.py:1715
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1780 ../src/gui_interface.py:3083
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "Ma_rcadores"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Marcador já configurado"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3084
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "A sala \"%s\" já existe nos marcadores."
 
-#: ../src/disco.py:1790 ../src/gui_interface.py:3097
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Marcador foi adicionado com sucesso"
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3098
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2000
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Inscrito"
 
-#: ../src/disco.py:2008
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/disco.py:2072
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Nova postagem"
 
-#: ../src/disco.py:2078
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/disco.py:2084
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Desinscrever"
 
@@ -7671,7 +7472,7 @@ msgstr "Requer o python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Recurso não disponível no Windows."
 
@@ -7839,29 +7640,15 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Requer python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Banners e links clicáveis"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-"Habilidade de ter URL's clicáveis na janela de conversa e em banners da "
-"janela de conferência."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Requer python-sexy."
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr "Habilidade para iniciar uma conversa da áudio e vídeo."
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr "Requer o python-farsight."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Recurso"
 
@@ -7913,6 +7700,10 @@ msgstr "Salvo em: %s"
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Abrir pasta do arquivo"
+
 #: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Transferência de arquivos cancelada"
@@ -7971,12 +7762,12 @@ msgstr "Descrição: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:889
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:891
+#: ../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."
@@ -7984,22 +7775,22 @@ msgstr ""
 "Um arquivo com este nome já existe e você não tem permissão para sobrescrevê-"
 "lo."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:895
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Este arquivo já existe"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:895
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:902
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, 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:903
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Você não tem permissão para criar este diretório."
 
@@ -8047,64 +7838,44 @@ msgstr "Remetente: "
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Continuar"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "O Gajim necessita do servidor X para rodar. Encerrando..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "importação PyGTK falhou: %s"
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
 msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "O Gajim necessita do PyGTK 2.12 ou superior"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
 msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "O Gajim necessita do PyGTK 2.12 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
 msgid "Gajim needs GTK 2.16 or above"
 msgstr "O Gajim necessita do GTK 2.12 ou superior"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
 msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "O Gajim necessita do GTK 2.12 ou superior para rodar. Encerrando..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "Não existe suporte para libglade no GTK+ runtime"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
-"%s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Por favor certifique-se de que o GTK+ e o PyGTK tem suporte ao libglade em "
-"seu sistema."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim necessita de PySQLite2 para rodar"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "O Gajim precisa do pywin32 para rodar"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -8114,11 +7885,11 @@ msgstr ""
 "pode obtê-lo em %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:327
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "O Gajim já está em execução"
 
-#: ../src/gajim.py:328
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -8184,7 +7955,10 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível "
 
@@ -8571,6 +8345,10 @@ msgstr ""
 "Digite\"%(basename)s help %(command)s\" para maiores informações"
 
 #: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "URI incorreta"
 
@@ -8624,150 +8402,151 @@ msgstr "Conversação continuada"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1217 ../src/gui_interface.py:1052
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Algum ocupante tem permissão de ver o seu JID inteiro"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1220
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "A gravação das conversas da sala está ligado"
 
-#: ../src/groupchat_control.py:1222
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Uma nova sala foi criada"
 
-#: ../src/groupchat_control.py:1225
+#: ../src/groupchat_control.py:1221
 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:1231
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_control.py:1235
+#: ../src/groupchat_control.py:1231
 #, 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:1245
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_control.py:1249
+#: ../src/groupchat_control.py:1245
 #, 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:1261 ../src/groupchat_control.py:1356
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_control.py:1277 ../src/gui_interface.py:896
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1315 ../src/groupchat_control.py:1319
-#: ../src/groupchat_control.py:1324
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1316
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "filiação alterada"
 
-#: ../src/groupchat_control.py:1321
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "a configuração da sala mudou para aceitar apenas membros"
 
-#: ../src/groupchat_control.py:1326
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "desligamento do sistema"
 
-#: ../src/groupchat_control.py:1405
+#: ../src/groupchat_control.py:1401
 #, 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:1409
+#: ../src/groupchat_control.py:1405
 #, 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:1424
+#: ../src/groupchat_control.py:1420
 #, 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:1428
+#: ../src/groupchat_control.py:1424
 #, 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:1457
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_control.py:1462
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s entrou na conferência"
 
-#: ../src/groupchat_control.py:1464 ../src/gui_interface.py:921
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 agora está %(status)s"
 
-#: ../src/groupchat_control.py:1692
+#: ../src/groupchat_control.py:1688
 #, 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:1694
+#: ../src/groupchat_control.py:1690
 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:1698 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1935 ../src/gui_interface.py:1970
-#: ../src/message_window.py:227 ../src/roster_window.py:2675
-#: ../src/roster_window.py:3318 ../src/roster_window.py:4026
+#: ../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 "_Não me pergunte novamente"
 
-#: ../src/groupchat_control.py:1731
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Mudando assunto"
 
-#: ../src/groupchat_control.py:1732
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Por favor, especifique o novo assunto:"
 
-#: ../src/groupchat_control.py:1739
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Mudando apelido"
 
-#: ../src/groupchat_control.py:1740
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Por favor, especifique o novo apelido que você quer usar:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1769
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Excluindo %s"
 
-#: ../src/groupchat_control.py:1770
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8775,22 +8554,22 @@ msgstr ""
 "Você está prestes a excluir definitivamente esta sala.\n"
 "Você deve especificar uma justificativa abaixo:"
 
-#: ../src/groupchat_control.py:1772
+#: ../src/groupchat_control.py:1768
 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:1956
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_control.py:1957 ../src/groupchat_control.py:2280
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2279
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -8809,61 +8588,61 @@ msgstr "Não é provavelmente fatal, mas deve ser reportado aos desenvolvedores.
 msgid "_Report Bug"
 msgstr "_Reportar erro"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detalhes"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:202 ../src/gtkgui_helpers.py:217
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:393
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:396
+#: ../src/gtkgui_helpers.py:403
 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:437
+#: ../src/gtkgui_helpers.py:444
 #, 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:806
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "O Gajim não é o cliente Jabber padrão"
 
-#: ../src/gtkgui_helpers.py:807
+#: ../src/gtkgui_helpers.py:819
 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:808
+#: ../src/gtkgui_helpers.py:820
 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:875
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Extensão não suportada"
 
-#: ../src/gtkgui_helpers.py:876
+#: ../src/gtkgui_helpers.py:888
 #, 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:912
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Salvar imagem como..."
 
-#: ../src/gui_interface.py:130
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8874,58 +8653,58 @@ msgstr ""
 "outro ocupante.\n"
 "Por favor, especifique um outro apelido abaixo:"
 
-#: ../src/gui_interface.py:133
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Sempre usar este apelido quando houver um conflito"
 
-#: ../src/gui_interface.py:150
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: ../src/gui_interface.py:152
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Você aceita essa requisição na conta %s?"
 
-#: ../src/gui_interface.py:155
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Autorização HTTP (%(method)s) para %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:204 ../src/notify.py:519
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Falha na conexão"
 
-#: ../src/gui_interface.py:543 ../src/gui_interface.py:547
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:557 ../src/gui_interface.py:571
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "erro ao enviar %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:596 ../src/notify.py:521
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Solicitação de inscrição"
 
-#: ../src/gui_interface.py:621
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gui_interface.py:622
+#: ../src/gui_interface.py:688
 #, 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:634
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gui_interface.py:635
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8933,61 +8712,61 @@ 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:659 ../src/notify.py:523
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Desinscrever"
 
-#: ../src/gui_interface.py:700
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gui_interface.py:988
+#: ../src/gui_interface.py:1013
 #, 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:1055
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "A sala agora exibe membros indisponíveis"
 
-#: ../src/gui_interface.py:1057
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "a sala agora não mostra membros indisponíveis"
 
-#: ../src/gui_interface.py:1060
+#: ../src/gui_interface.py:1085
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Uma modificação na configuração da sala que não tem relação com privacidade "
 "ocorreu"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "A gravação das conversas da sala está ativo agora"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "A gravação das conversas da sala está desligado agora"
 
-#: ../src/gui_interface.py:1067
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Agora a sala é não-anônima"
 
-#: ../src/gui_interface.py:1070
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Agora a sala é semi-anônima"
 
-#: ../src/gui_interface.py:1073
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Agora a sala é totalmente anônima"
 
-#: ../src/gui_interface.py:1105
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
@@ -8995,23 +8774,23 @@ msgstr ""
 "Você configurou o Gajim para usar o agente do GPG, mas não há agente do GPG "
 "rodando ou então ele retornou uma frase secreta incorreta.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Frase de acesso OpenGPG incorreta"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "Chave GPG não confiável"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -9019,27 +8798,28 @@ msgstr ""
 "A chave GPG usada para criptografar esta conversa não é confiável. Você "
 "realmente deseja criptografar esta mensagem?"
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1290
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novo email em %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1321
 #, 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:1305
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -9054,42 +8834,42 @@ msgstr ""
 "Assunto: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1373
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo."
 
-#: ../src/gui_interface.py:1410 ../src/roster_window.py:1824
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "O contato remoto parou a transferência"
 
-#: ../src/gui_interface.py:1412 ../src/roster_window.py:1826
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Erro abrindo arquivo"
 
-#: ../src/gui_interface.py:1443
+#: ../src/gui_interface.py:1475
 #, 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:1447
+#: ../src/gui_interface.py:1479
 #, 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:1460
+#: ../src/gui_interface.py:1492
 #, 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:1464
+#: ../src/gui_interface.py:1496
 #, 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:1573
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -9098,36 +8878,36 @@ msgstr ""
 "Não foi possível descriptografar a mensagem de %s\n"
 "Ela pode ter sido adulterada."
 
-#: ../src/gui_interface.py:1580
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Não foi possível descriptografar a mensagem"
 
-#: ../src/gui_interface.py:1654
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Conflito de nome de usuário"
 
-#: ../src/gui_interface.py:1655
+#: ../src/gui_interface.py:1687
 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:1667
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1680
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1691
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Erro."
 
-#: ../src/gui_interface.py:1718
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Conflito de recurso"
 
-#: ../src/gui_interface.py:1719
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -9136,20 +8916,20 @@ msgstr ""
 "novo"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1766
+#: ../src/gui_interface.py:1800
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s quer iniciar uma conversa com voz."
 
-#: ../src/gui_interface.py:1769
+#: ../src/gui_interface.py:1803
 msgid "Voice Chat Request"
 msgstr "Solicitação de conversa com voz"
 
-#: ../src/gui_interface.py:1874
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Erro ao verificar o certificado SSL"
 
-#: ../src/gui_interface.py:1875
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -9160,15 +8940,15 @@ msgstr ""
 "(error)s\n"
 "Você ainda deseja conectar-se a este servidor?"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignorar este erro para este certificado."
 
-#: ../src/gui_interface.py:1900
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Erro de certificado SSL"
 
-#: ../src/gui_interface.py:1901
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9185,23 +8965,27 @@ msgstr ""
 "\n"
 "Você ainda quer conectar e atualizar o fingerprint do certificado?"
 
-#: ../src/gui_interface.py:1931 ../src/gui_interface.py:1966
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Conexão não-segura"
 
-#: ../src/gui_interface.py:1932
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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á prestes a enviar sua senha em um conexão não-criptografada. Tem "
-"certeza que quer fazer isto?"
+"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:1934 ../src/gui_interface.py:1969
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Sim, eu realmente quero me conectar de modo não-seguro"
 
-#: ../src/gui_interface.py:1967
+#: ../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?"
@@ -9209,21 +8993,30 @@ 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:1987
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Você está prestes a enviar sua senha em um conexão não-criptografada. Tem "
+"certeza que quer fazer isto?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "O nó PEP não foi removido"
 
-#: ../src/gui_interface.py:1988
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "O nó PEP %(node)s não foi removido: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2546 ../src/gui_interface.py:2568
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Emoticons desabilitados"
 
-#: ../src/gui_interface.py:2547
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -9231,7 +9024,7 @@ msgstr ""
 "Você configurou um tema de emoticons que não foi encontrado, então os "
 "emoticons estão desativados."
 
-#: ../src/gui_interface.py:2569
+#: ../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 "
@@ -9241,42 +9034,42 @@ msgstr ""
 "precisar atualizar o formato do arquivo emoticons.py. Veja http://trac.gajim."
 "org/wiki/Emoticons para mais detalhes."
 
-#: ../src/gui_interface.py:2597 ../src/roster_window.py:3474
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2964
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gui_interface.py:3461
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Entre com a frase de acesso da chave GPG %(keyid)s para conta (account %"
 "(account)s)."
 
-#: ../src/gui_interface.py:3476
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "A chave GPG expirou"
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3608
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Sua chave GPG expirou, você será conectado ao %s sem OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3486
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso errada"
 
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Por favor, reescreva sua frase secreta de GPG ou pressione Cancelar."
 
@@ -9299,7 +9092,7 @@ msgstr "Contatos"
 
 #. holds time
 #: ../src/history_manager.py:167 ../src/history_manager.py:207
-#: ../src/history_window.py:97
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Data:"
 
@@ -9310,7 +9103,7 @@ msgstr "Apelido"
 
 #. holds message
 #: ../src/history_manager.py:181 ../src/history_manager.py:213
-#: ../src/history_window.py:105
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Mensagem"
 
@@ -9402,27 +9195,27 @@ msgstr "Tempo esgotado ao carregar a imagem"
 msgid "Image is too big"
 msgstr "A imagem é grande demais"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Você realmente deseja fechar todas?"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Conversas"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Conferências"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Conversas privadas"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Mensagens"
 
@@ -9434,47 +9227,47 @@ msgstr "- as mensagens serão gravadas"
 msgid "- messages will not be logged"
 msgstr "- as mensagens não serão gravadas"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s alterou seu status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s conectou"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s desconectou"
 
-#: ../src/notify.py:277
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova mensagem simples de %(nickname)s"
 
-#: ../src/notify.py:284
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nova mensagem privada da conferência %s"
 
-#: ../src/notify.py:286
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:289
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Mensagem enviada por %(nickname)s"
 
-#: ../src/notify.py:294
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nova mensagem de %(nickname)s"
 
-#: ../src/notify.py:561
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorar"
 
@@ -9482,18 +9275,18 @@ msgstr "Ignorar"
 msgid "Retrieving profile..."
 msgstr "Recuperando perfil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2862
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "O arquivo está vazio"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2865
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "O arquivo não existe"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2867 ../src/roster_window.py:2878
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "A imagem não pode ser carregada"
 
@@ -9524,51 +9317,51 @@ msgid ""
 msgstr ""
 "Houve um erro ao publicar sua informação pessoal, tente outra vez mais tarde."
 
-#: ../src/roster_window.py:282 ../src/roster_window.py:1023
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:1886
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1941
 #, 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:1924
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1925
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG não é usável"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
 
-#: ../src/roster_window.py:2163 ../src/roster_window.py:3411
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:2164 ../src/roster_window.py:3412
+#: ../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?"
@@ -9576,27 +9369,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:2190
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "não sincronizado"
 
-#: ../src/roster_window.py:2251
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Realmente sair do Gajim?"
 
-#: ../src/roster_window.py:2252
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Você tem certeza que deseja sair?"
 
-#: ../src/roster_window.py:2253
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Sempre fechar o Gajim"
 
-#: ../src/roster_window.py:2348 ../src/roster_window.py:2593
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Cancelar transferência de arquivo"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:2349
+#: ../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."
@@ -9604,16 +9408,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:2594
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Você precisa lê-los antes de remover este transporte."
 
-#: ../src/roster_window.py:2597
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:2598
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9621,11 +9425,11 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens dos contatos usando este "
 "transporte."
 
-#: ../src/roster_window.py:2601
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Os transportes serão removidos"
 
-#: ../src/roster_window.py:2606
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9634,12 +9438,12 @@ msgstr ""
 "Você não poderá mais enviar e receber mensagens para contatos destes "
 "transportes: %s"
 
-#: ../src/roster_window.py:2670
+#: ../src/roster_window.py:2731
 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:2672
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9648,56 +9452,56 @@ msgstr ""
 "ele enviar para você."
 
 #. it's jid
-#: ../src/roster_window.py:2758
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Renomear contato"
 
-#: ../src/roster_window.py:2759
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Entre com um novo apelido para o contato %s"
 
-#: ../src/roster_window.py:2766
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Renomear grupo"
 
-#: ../src/roster_window.py:2767
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Entre com um novo nome para o grupo %s"
 
-#: ../src/roster_window.py:2808
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Remover grupo"
 
-#: ../src/roster_window.py:2809
+#: ../src/roster_window.py:2879
 #, 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:2810
+#: ../src/roster_window.py:2880
 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:2849
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:2850
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:3227
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3305
 #, 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:3234
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9706,11 +9510,11 @@ msgstr ""
 "ele ou ela sempre o verá offiline."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3240
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Você quer continuar?"
 
-#: ../src/roster_window.py:3243
+#: ../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."
@@ -9718,16 +9522,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:3246
+#: ../src/roster_window.py:3323
 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:3250
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Os contatos serão removidos da sua lista"
 
-#: ../src/roster_window.py:3255
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9737,36 +9541,37 @@ msgstr ""
 "você também remove a autorização fazendo com que eles sempre vejam você "
 "offline."
 
-#: ../src/roster_window.py:3312
+#: ../src/roster_window.py:3390
+#, 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:3314
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 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:3333
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:3334
+#: ../src/roster_window.py:3412
 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:3930
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "O armazenamento de metacontatos não é suportado pelo seu servidor"
 
-#: ../src/roster_window.py:3932
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9774,13 +9579,13 @@ msgstr ""
 "O seu servidor não suporta a gravação de informação de metacontatos, então "
 "essas informações não estarão salvas na próxima vez que você conectar."
 
-#: ../src/roster_window.py:4020
+#: ../src/roster_window.py:4114
 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:4022
+#: ../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 "
@@ -9790,23 +9595,23 @@ msgstr ""
 "Geralmente isso é usado quando a mesma pessoa possui muitas contas de Jabber "
 "ou transportes."
 
-#: ../src/roster_window.py:4137
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Arquivo URI inválido:"
 
-#: ../src/roster_window.py:4148
+#: ../src/roster_window.py:4243
 #, 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:4263
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Enviar %s para %s"
 
-#: ../src/roster_window.py:4269
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Fazer %s e %s metacontatos"
@@ -9816,131 +9621,130 @@ msgstr "Fazer %s e %s metacontatos"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4707 ../src/roster_window.py:4778
-#: ../src/roster_window.py:4787 ../src/statusicon.py:245
-#: ../src/statusicon.py:292 ../src/statusicon.py:298
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
 #. add
-#: ../src/roster_window.py:4794
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
 #. disco
-#: ../src/roster_window.py:4799
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#: ../src/roster_window.py:4836 ../src/statusicon.py:308
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Gerenciar marcadores..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4856
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "da conta %s"
 
-#: ../src/roster_window.py:4896
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:4952 ../src/roster_window.py:5055
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Mudar mensagem de status"
 
-#: ../src/roster_window.py:4984
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Publicar sintonia"
 
-#: ../src/roster_window.py:4986
+#: ../src/roster_window.py:5101
 #, fuzzy
 msgid "Publish Location"
 msgstr "Publicar sintonia"
 
-#: ../src/roster_window.py:4989
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Configurar serviços..."
 
-#: ../src/roster_window.py:5133
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maximizar tudo"
 
-#. Send Group Message
-#: ../src/roster_window.py:5141 ../src/roster_window.py:5309
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Enviar m_ensagem de grupo"
 
-#: ../src/roster_window.py:5149
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Para todos os usuários"
 
-#: ../src/roster_window.py:5153
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Para todos os usuários conectados"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5329
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Gerenciar contatos"
 
 #. Edit Groups
-#: ../src/roster_window.py:5337
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Editar _grupos"
 
 #. Send single message
-#: ../src/roster_window.py:5392
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Enviar mensagem simples"
 
 #. Execute Command
-#: ../src/roster_window.py:5438
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Executar comando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5448
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Gerenciar transporte"
 
 #. Modify Transport
-#: ../src/roster_window.py:5456
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Modificar transporte"
 
 #. Rename
-#: ../src/roster_window.py:5465
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/roster_window.py:5526
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maximizar"
 
-#: ../src/roster_window.py:5534
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Reconectar"
 
-#: ../src/roster_window.py:5540
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Desconectar"
 
 #. History manager
-#: ../src/roster_window.py:5622
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Gerenciador de histórico"
 
-#: ../src/roster_window.py:5633
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Ingressar em uma nova Conferência"
 
-#: ../src/roster_window.py:5800
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Mudar mensagem de status..."
 
@@ -9971,13 +9775,13 @@ msgid "Confirm these session options"
 msgstr "Confirme essas opções de sessão"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "O cliente remoto quer negociar uma sessão com esses recursos:\n"
 "\n"
@@ -10000,11 +9804,16 @@ msgstr ""
 "\n"
 "Continuar com a sessão?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Mudar mensagem de status..."
 
 #: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "na _lista"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
@@ -10186,6 +9995,358 @@ msgstr "Não há requisições de inscrições pendentes."
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "_Entrar em uma conferência..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Adicionar contato..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Descubra serviços"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Executar comando..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Alterar conta"
+
+#~ msgid "_Personal Events"
+#~ msgstr "Eventos _pessoais"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Iniciar conversa..."
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Alteração da conta"
+
+#~ 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 ""
+#~ "Marque esta opção para o Gajim se conectar na porta 5223 onde servidores "
+#~ "antigos disponibilizam recursos SSL. Note que o Gajim usa criptografia "
+#~ "TLS por padrão se disponibilizada pelo servidor e com esta opção "
+#~ "habilitada o TLS será desabilitado"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Editar detalhes pessoais..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Nome do computador: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Se checado, o Gajim irá gravar sua senha em ~/.gajim/config com permissão "
+#~ "de 'leitura' somente para você"
+
+#~ msgid "Port: "
+#~ msgstr "Porta: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxy:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Salvar _frase de acesso (inseguro)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Enviar pacotes para manter a conexão (keep-alive)"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Usar _SSL (obsoleto, apenas para servidores antigos)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Ajustar para status"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Excluir MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Enviar mensagem de servidor..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Mensagem recebida\n"
+#~ "Contato desconectado \n"
+#~ "Status do contato alterado \n"
+#~ "Destacar mensagens em conferências \n"
+#~ "Mensagem de conferência recebida \n"
+#~ "Transferência de arquivo solicitada \n"
+#~ "Transferência de arquivo iniciada \n"
+#~ "Transferência de arquivo concluída"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "contato(s)\n"
+#~ "grupo(s)\n"
+#~ "todo mundo"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "_Entrar em uma conferência"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Copiar e-mail/JID"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Copiar URL"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Abrir cliente de e-mail"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Visualizar no navegador"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Iniciar conversa"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Linha conta\n"
+#~ "Linha grupo\n"
+#~ "Linha contato\n"
+#~ "Banner de conversa"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Alterar _apelido..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Alterar as_sunto..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Configurar _sala..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Excluir sala"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Gerenciar sala"
+
+#~ msgid "Send _File"
+#~ msgstr "Enviar _arquivo"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Adicionar à lista"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Enviar mensagem privada"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Digite o JID ou o nome do contato\n"
+#~ "Históricos das salas\n"
+#~ "Todos os históricos de conversa"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Gerenciar contas"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Adicionar este contato para a lista (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Adicionar esta sala aos marcadores (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Pesquisar o histórico de conversas (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Alterar o assunto da sala (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Alterar o seu apelido (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Convidar contatos para a conversa (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Enviar um arquivo (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Exibe uma lista de emoticons (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Exibe uma lista de formatações"
+
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Exibir um menu com funções avançadas (Alt+D)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Exibir o perfil do contato (Ctrl+I)"
+
+#~ msgid "Toggle audio session"
+#~ msgstr "Alternar sessão de áudio"
+
+#~ msgid "Toggle video session"
+#~ msgstr "Alternar sessão de vídeo"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Todos os status de conversa\n"
+#~ "Escrevendo somente\n"
+#~ "Desabilitado"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Auto-detectar a cada inicialização do Gajim\n"
+#~ "Sempre usar aplicações no padrão GNOME\n"
+#~ "Sempre usar aplicações no padrão KDE\n"
+#~ "Sempre usar aplicações no padrão Xfce\n"
+#~ "Personalizar"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Lista separada com conversas separadas\n"
+#~ "Lista separada com conversa simples\n"
+#~ "Janela simples para tudo\n"
+#~ "Lista separada com conversas agrupadas por conta\n"
+#~ "Lista separada com conversas agrupadas por tipo"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Exibir em um pop-up\n"
+#~ "Notificar-me sobre isto\n"
+#~ "Mostra apenas na lista"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "nenhum\n"
+#~ "ambos\n"
+#~ "de\n"
+#~ "para"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Adicionar _contato..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Re_cursos"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Transferência de _arquivos"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Perfil, A_vatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "Cont_as"
+
+#~ msgid "_Contents"
+#~ msgstr "Índi_ces"
+
+#~ msgid "_FAQ"
+#~ msgstr "_FAQ"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Preferências"
+
+#~ msgid "_Quit"
+#~ msgstr "_Sair"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Enviar mensagem simples..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Enviar _mensagem simples"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Conferência"
+
+#~ msgid "Enable"
+#~ msgstr "Habilitar"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Alterar conta..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Banners e links clicáveis"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Habilidade de ter URL's clicáveis na janela de conversa e em banners da "
+#~ "janela de conferência."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Requer python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "Não existe suporte para libglade no GTK+ runtime"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Por favor remova seu GTK+ runtime atual e instale a última versão estável "
+#~ "de %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Por favor certifique-se de que o GTK+ e o PyGTK tem suporte ao libglade "
+#~ "em seu sistema."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim necessita de PySQLite2 para rodar"
+
 #~ msgid "Wrong host"
 #~ msgstr "Servidor errado"
 
@@ -10291,12 +10452,6 @@ msgstr " recurso com prioridade "
 #~ msgid "No help info for /%s"
 #~ msgstr "Sem ajuda para /%s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Sempre usar as aplicações padrões do OS/X"
-
-#~ msgid "Custom"
-#~ msgstr "Personalizar"
-
 #~ msgid "File transfer stopped by the contact at the other end"
 #~ msgstr "Transferência de arquivo parada pelo contato do outro lado"
 
@@ -10847,9 +11002,6 @@ msgstr " recurso com prioridade "
 #~ msgstr ""
 #~ "Salvar _posição e tamanho das janelas de conversa e lista de contatos"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Mostre somente na _lista"
-
 #~ msgid "Use t_rayicon (aka. notification area icon)"
 #~ msgstr "Usar ícone na bandeja (também conhecido por área de notificação)"
 
@@ -10865,15 +11017,6 @@ msgstr " recurso com prioridade "
 #~ "somente se for uma mensagem nova de um contato que você não está "
 #~ "conversando"
 
-#~ msgid "_Never"
-#~ msgstr "_Nunca"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Notifique-me sobre isto"
-
-#~ msgid "_Pop it up"
-#~ msgstr "_Alerta visual"
-
 #~ msgid "_Remove from Roster"
 #~ msgstr "_Remover da Lista"
 
diff --git a/po/ru.po b/po/ru.po
index 1529336d2..02e4c6ba4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-10-30 01:02+0300\n"
 "Last-Translator: Fomin Denis <fominde@mail.ru>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -25,59 +25,11 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "X-Poedit-Basepath: /home/test/gajim\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Jabber-клиент на GTK+"
-
-#: ../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 клиент для мгновенных сообщений"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Войти в _комнату"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Добавить контакт..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Просмотреть сервисы"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "В_ыполнить команду..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Редактировать учетную запись"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Открыть Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Расширенный статус"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Начать беседу"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Статус"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -87,23 +39,23 @@ msgstr ""
 "\n"
 "Подождите..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Выберите одну из опций из списка ниже:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Заполните данные для вашей новой учетной записи</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Выберите сервер</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -111,57 +63,64 @@ msgstr ""
 "Добавить этот сертификат в список надёжных сертификатов.\n"
 "Отпечаток SHA1 сертификата:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Анонимная аут_ентификация"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Подключиться, когда я нажму «Закончить»"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: мастер создания учетной записи"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "У меня уже есть учетная запись, которую я хочу _использовать"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Я хочу _зарегистрировать новую учетную запись"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Если отмечено, то Gajim запомнит пароль учетной записи"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Управление..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Нет"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Про_кси:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Сохранить _пароль"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Настроить мой профиль после соединения"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Использовать пользовательские хост/порт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -169,148 +128,142 @@ msgstr ""
 "Необходимо создать учетную запись для присоединения \n"
 "к сети Jabber."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Дополнительно"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Закончить"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Хост: "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Прочее</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Личная информация</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Изменение учетной записи"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Учётные записи"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Административные операции"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Анонимная аутентификация"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Автоподключение при разрыве связи"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_Соединяться при запуске Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "И_зменить пароль"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Если отмечено, то Gajim будет соединяться с портом 5223, на котором старые "
-"сервера обычно ожидают подключения по SSL. Заметьте, что Gajim использует "
-"TLS шифрование по умолчанию, если сервер предоставляет такую возможность, с "
-"этой же опцией TLS отключается"
+"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
+"через незащищенное соединение."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Выбрать _ключ..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Щелкните для изменения пароля"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Щелкните, чтобы запросить авторизацию у всех контактов другой учетной записи"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "_Соединяться при запуске Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Соединение"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Редактировать личную информацию..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Почта:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Имя:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Общие"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Хост: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -318,8 +271,11 @@ msgstr ""
 "Если отмечено, Gajim будет передавать еще несколько IP адресов в дополнение "
 "к вашему, так что передача файла имеет больше шансов на успех."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
+
+#: ../data/gui/accounts_window.ui.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -327,16 +283,7 @@ msgstr ""
 "Если отмечено, то Gajim будет пинговать сервер, чтобы избежать разрыва "
 "соединения по таймауту"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на "
-"чтение только для вас"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -344,8 +291,7 @@ msgstr ""
 "Если отмечено, Gajim после запуска будет автоматически подсоединяться к "
 "jabber серверу с использованием этой учетной записи"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -355,47 +301,49 @@ msgstr ""
 "выпадающего списка внизу окна ростера) повлекут за собой изменение статуса "
 "этой учетной записи"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"Если порт по умолчанию, который используется для входящих сообщения вас не "
+"устраивает, вы можете выбрать другой.\n"
+"Также, возможно, придется изменить некоторые настройки брандмауэра."
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Информация о вас, сохраненная на сервере"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Фамилия:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Объединить учетные записи"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Нет"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Личная информация"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Порт: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -406,22 +354,20 @@ msgstr ""
 "той же учетной записью. Клиент с наибольшим приоритетом будет получать "
 "события"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Изменять приоритет автоматически в соответствии со статусом."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Прокси:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "П_ереименовать"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Ресу_рс: "
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -435,200 +381,90 @@ msgstr ""
 "с ресурсов 'Дом' или 'Работа'. Ресурс, обладающий большим приоритетом, будет "
 "получать все события. (См. ниже)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Сохранить _парольную фразу (небезопасно)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "_Сохранять историю для всех контактов"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Отправить пинг"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Отправлять _пинг"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизировать статус учетной записи с глобальным статусом"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Объединить контакты"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Использовать _SSL (устарело)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Использовать прокси для передачи файла"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "В _зависимости от статуса"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Имя: "
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Прокси</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "В _зависимости от статуса"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Учётные записи"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Анонимная аутентификация"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
-"через незащищенное соединение."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "_Соединяться при запуске Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Почта:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Имя:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Фамилия:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Объединить учетные записи"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "П_ереименовать"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Отправлять _пинг"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Син_хронизировать статус учетной записи с глобальным статусом"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Объединить контакты"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Использовать GPG _Agent"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Использовать польз_овательские хост/порт"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "_Другой порт:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Использовать прокси для передачи файла"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "Редактировать личную информацию..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Включить"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Хост: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Управление..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Порт:"
 
 # insecure - небезопастный или незащищенный?
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Предупреждать перед использованием незащищенного соединения"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_использовать переменную HTTP_PROXY"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "Учётная запи_сь:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/gui/add_new_contact_window.ui.h:2
 msgid "A_llow this contact to view my status"
 msgstr "Позволить ему или ей видеть мой ст_атус"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Добавить новый контакт"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -640,7 +476,7 @@ msgstr ""
 "использующий данный протокол.\n"
 "Нажмите «Зарегистрироваться», чтобы это сделать."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -648,411 +484,468 @@ msgstr ""
 "Чтобы добавить контакт для этого протокола,\n"
 "нужно соединиться с транспортом."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Группа:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Ник:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Протокол:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "За_регистрироваться"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Произошла ошибка:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Выберите команду:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Специальные команды — Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Проверить еще раз"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Описание ошибки..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Получаю список команд. Подождите..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Происходит отправка команды. Подождите..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Подождите..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "На этот объект нельзя подействовать какой-либо командой."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Описание</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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, чтобы некоторые настройки "
 "вступили в силу"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Расширенный редактор настроек"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Фильтр:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Удалить сообщение дня"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Удаляет сообщение дня."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Редактировать _списки доступа..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr ""
 "Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Установить сообщение дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Устанавливает сообщение дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Показать консоль _XML"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Обновить сообщение дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Обновляет сообщение дня"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Администрирование"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Отправить сообщение сервера"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr " с этим контактом открытых окон/вкладок"
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Действия</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Условия</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Звуки</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Дополнительные действия"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Дополнительное управление уведомлениями"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Все статусы"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Ушел"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Занят "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Невидимка"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Выполнить команду"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Недоступен"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Один или несколько специальных статусов..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "В сети / Готов поболтать"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Проигрывать звук"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Получено сообщение\n"
-"Контакт отключился\n"
-"Контакт сменил статус\n"
-"Упоминание в комнате\n"
-"Сообщение в комнате\n"
-"Запрос на передачу файла\n"
-"Начата передача файла\n"
-"Завершена передача файла"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 "_Активировать функцию оконного менеджера «UrgencyHint», чтобы окно чата "
 "мигало на панели"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Отключить автоматическое открытие окна чата"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Отключить все всплывающие окна"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Отключить звуки для этого события"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Отключить показ события в ростере"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Отключить показ события в системном лотке"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Сообщить с помощью всплывающего окна"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Открыть окно чата с контактом"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Показывать событие в ростере"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Показывать событие в системном лотке"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "и у меня"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "Контакты"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
-"контакт(ы)\n"
-"группа(ы)\n"
-"все"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "для "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Запись:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Название ленты:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Последнее изменение:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Получена новая запись"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Получена новая запись:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Заблокированные контакты"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Сообщение:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Выбрать занятие"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Выбрать занятие"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Сообщение:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Настроение:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Изменить пароль"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Введите ещё раз для подтверждения:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Введите новый пароль"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Введите ваше новое сообщение о статусе</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Занятие:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Настроение:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Предустановленные сообщения:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Сохранить как предустановленное сообщение..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Войти в _комнату"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "№"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Добавить в ростер"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Скопировать JID/почтовый адрес"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Копировать адрес ссылки"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Отправить письмо"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Просмотреть ссылку в браузере"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Начать беседу"
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Отправить"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "_Пригласить"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Пригласить друзей!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "сервер MUC"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Выберите сервер конференций."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1060,187 +953,185 @@ msgstr ""
 "Вы собираетесь начать чат (Multi-User Chat).\n"
 "Выберите контакты, которых вы хотите пригласить"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "_Попросить возможность видеть его или её статус"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Добавить специальное _уведомление"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Назначить ключ Open_PGP"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "В_ыполнить команду..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Редактировать _группы"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "_Пригласить в"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Пригласить _участников"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "_Удалить"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Установи_ть статус"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Отправить одиночное _сообщение..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Отправить _файл..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Установить _аватар..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Начать _беседу"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Включить End to End шифрование"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Включить Open_PGP шифрование"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Добавить в ростер"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Позволить ему или ей видеть мой статус"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Блокировать"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Запретить ему или ей видеть мой статус"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_История"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Игнорировать"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Управление контактом"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "П_ереименовать"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Подписка"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Разблокировать"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Прекратить игнорирование"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Заполните форму."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Настройки комнаты"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Редактировать группы"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(информация <b>ESession</b>)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Удостоверить"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Список возможных функций Gajim:</b>"
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Возможности"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Список активных, завершенных и остановленных передач файлов"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Отменить передачу"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Отменяет выбранную передачу"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../data/gui/filetransfers.ui.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Отменяет выбранную передачу и удаляет неполные файлы"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Очистить"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Передача файлов"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Скрывает окно"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Удалить передачу из списка."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Удаляет завершенные, отмененные и неудачные передачи из списка"
 
-#: ../data/glade/filetransfers.glade.h:10
+#: ../data/gui/filetransfers.ui.h:10
 msgid "Shows a list of file transfers between you and others"
 msgstr "Показывает список передач между вами и остальными"
 
-#: ../data/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1248,81 +1139,80 @@ msgstr ""
 "Это действие удаляет единичную передачу из списка. Если передача еще "
 "активна, она сначала останавливается, а затем удаляется"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показать уведомление по окончании загрузки"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Продолжить"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомить меня, когда передача файлов закончится"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Открыть папку с принятым файлом"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Приостановить"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "список передач"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Цвета вкладок с чатами</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Учетная запись\n"
-"Группа\n"
-"Контакт\n"
-"Баннер в окне чата"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Учетные записи"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Полужирный"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Печатает"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Контакт"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Начертание:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Настройка тем для Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Ушел"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Группа"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Неактивен"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
 msgstr "Сообщения MUC"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1330,109 +1220,73 @@ msgstr ""
 "Адресованные\n"
 "сообщения MUC"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Приостановился"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Цвет _текста:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Шрифт:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "Цвет _фона"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Изменить _ник"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Изменить _тему"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Настроить _комнату"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "Добавить эту комнату в _закладки"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Уничтожить комнату"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Управление комнатой"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Сворачивать при закрытии"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "_Модератор"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Действия над посетителем"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Отправить _файл"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Добавить в ростер"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Админ"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Забанить"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Выгнать"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Участник"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Владелец"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Отправить личное сообщение"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Право говорить"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Создать новое сообщение"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "От"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Тема"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1443,25 +1297,19 @@ msgstr ""
 "запущен. Избегайте удалений из логов контактов, с которыми вы разговариваете "
 "в этот момент."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Добро пожаловать в менеджер истории Gajim'а</b></big>"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Удалить"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Экспорт"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Менеджер истории Gajim'а"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1476,402 +1324,420 @@ msgstr ""
 "Используйте эту программу для удаления или экспорта истории. Вы можете "
 "выбрать лог слева или воспользоваться поиском в базе."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Поиск в базе данных"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Введите JID или имя контакта\n"
-"История конференций\n"
-"История всех чатов"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Имя контакта"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Комнаты"
+
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Поиск:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_История сообщения"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Добавить комнату в закладки"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Браузер"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Войти в комнату"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:4
+#, fuzzy
+msgid "Join this room _automatically when I connect"
 msgstr "Автовход в комнату при подключении"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Ник:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Недавно:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Комната:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Добавить комнату в закладки"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Присоединиться"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Управление учетными записями"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Автоматическое присоединение"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Если отмечено, то Gajim будет входить в комнату при запуске"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Управление закладками"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Сворачивать при автовходе"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Показывать статус:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Сервер:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Настройка PEP сервисов"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Настроить"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Свойства</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Настройки</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Управление профилями прокси"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "П_ароль"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Хост прокси:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "_Порт прокси:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Использовать про_кси HTTP"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Использовать прокси аут_ентификацию"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "URL _BOSH:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Имя: "
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Тип:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Имя пользователя:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Добавить контакт в ростер (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Добавить комнату в закладки (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Открыть историю чата (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Изменить тему (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Изменить ник (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Пригласить к беседе (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Отправить файл (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Показать набор смайлов (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Показать список форматирования"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Показать меню дополнительных функций (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Показать информацию о контакте (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Отправить"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Расширенный редактор настроек</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Приложения</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Действия</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Авто статус</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Настройки окна чата</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Цвета вкладок с чатами</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Уведомления</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Условия</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Пользовательские настройки</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Шрифт</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Настройки GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Предустановленные сообщения о статусе</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Уведомления</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Настройки ростера</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Сообщения о статусе</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Настройки интерфейса</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Отчество:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Уведомления</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Расширенные..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Все состояния чата\n"
-"Только печать\n"
-"Отключено "
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Все статусы"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Отсылать информацию об _ОС"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Отсылать информацию об _ОС"
+
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Позволять уведомления в режиме _ушел/недоступен/занят/невидимка"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Проигрывать звук, когда я _занят"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Ушел"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Всегда использовать приложения OS/X по умолчанию"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Всегда использовать приложения OS/X по умолчанию"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Всегда использовать приложения OS/X по умолчанию"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Запрашивать сообщение о статусе, когда я: "
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Определять автоматически при каждом запуске Gajim\n"
-"Всегда использовать приложения GNOME по умолчанию\n"
-"Всегда использовать приложения KDE по умолчанию\n"
-"Всегда использовать приложения Xfce по умолчанию\n"
-"Другое"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "_Соединяться при запуске Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Сообщение чата:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 "_Всегда проверять при запуске, является ли Gajim jabber-клиентом по умолчанию"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Печатает"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Настроить цвет и шрифт интерфейса"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Сообщение чата:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Имя контакта"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Другое"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
-"Отдельно ростер и отдельно каждое окно чата\n"
-"Отдельно ростер и отдельно одно окно с чатами\n"
-"Всё в одном окне\n"
-"Отдельно ростер и окна чатов сгруппированных по учетной записи\n"
-"Отдельно ростер и окна чатов сгруппированных по типу"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Отключены"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Показывать _занятия контактов в ростере"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Отображать _дополнительные данные о почте"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Показывать на_строения для контактов в ростере"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Отмечать контакты, слушающие музыку (tunes)"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показывать а_ватары для контактов в ростере"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Показывать на_строения для контактов в ростере"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Показывать _сообщения о статусе контакта в ростере"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1881,7 +1747,7 @@ msgstr ""
 "Здесь вы можете указать, какие состояние чата вы хотели бы видеть в окне "
 "чата."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1891,7 +1757,7 @@ msgstr ""
 "контактом. Здесь вы можете указать, какие состояния чата Gajim будет "
 "отсылать вашему респонденту."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1899,11 +1765,11 @@ msgstr ""
 "Gajim будет уведомлять вас об отсоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Не показывать кнопки в окнах чата"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1911,21 +1777,21 @@ msgstr ""
 "Если отмечено, то Gajim будет разрешать определять операционную систему, "
 "которую вы используете"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr ""
 "Если отмечено, то Gajim будет включать информацию об отправителе новых писем."
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Если отмечено, то Gajim изменит статус на Away, если компьютер не "
 "используется."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1933,7 +1799,7 @@ msgstr ""
 "Если отмечено, Gajim будет менять статус на Недоступен, если компьютер долго "
 "не используется"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1941,7 +1807,7 @@ msgstr ""
 "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера и "
 "в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1949,25 +1815,32 @@ msgstr ""
 "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
 "его именем в окне ростера и в окнах комнат"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Если отмечено, то Gajim будет показывать занятия контактов в окне ростера"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Если отмечено, то Gajim будет показывать настроения контактов в окне ростера"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Если отмечено, то Gajim будет показывать tunes контактов в окне ростера"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1977,7 +1850,7 @@ msgstr ""
 "окон чата. Если язык проверки явно не задан, будет использован язык по "
 "умолчанию для данного контакта или комнаты."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1987,7 +1860,7 @@ msgstr ""
 "вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
 "от контактов не из вашего ростера."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -1997,14 +1870,14 @@ msgstr ""
 "Помните, что при использовании E2E шифрования удаленная сторона должна дать "
 "согласие на ведение истории, иначе сообщения не будут сохраняться."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
 msgstr ""
 "Если отмечено, то Gajim будет сообщать о новых письмах, полученных в GMail"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2014,7 +1887,7 @@ msgstr ""
 "(например, контакты из MSN будут иметь соответствующие иконки msn для "
 "статусов «в сети», «ушёл», «занят» и т.д.)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2022,7 +1895,7 @@ msgstr ""
 "Если включено, Gajim не будет запрашивать сообщение о статусе. Вместо него "
 "будет использовано соответствующее сообщение по умолчанию."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2030,79 +1903,101 @@ msgstr ""
 "Gajim заменяет текстовые смайлики, например ':)', их графическим или "
 "анимированным эквивалентом. Выберите «Отключены», чтобы этого не происходило."
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Записывать в лог _шифрованные сообщения"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "_Компактное окно сообщений"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "_Управление..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Никогда\n"
-"Только при пропущенных событиях\n"
-"Всегда"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Сервер"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Уведомления"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Уведомлять о контактах, которые _вошли: "
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Уведомлять о контактах, которые _вышли: "
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Уведомлять о контактах, которые _вышли: "
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Сообщать о новых письмах в _Gmail"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Никогда\n"
+"Только при пропущенных событиях\n"
+"Всегда"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Расширенные статусы"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
 msgstr ""
-"Показать всплывающее окно\n"
-"Сообщить мне об этом\n"
-"Показать в ростере"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Настройки"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Сервер:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "_Показывать событие в ростере"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Показывать иконку в системном лотке:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "В_ошел"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "В_ышел"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2110,27 +2005,27 @@ msgstr ""
 "Некоторые сообщения могут содержать форматирование (цвет, шрифт и т.д.). "
 "Если отмечено, Gajim будет отображать только их текст, без форматирования."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Сортировать контакты по статусу"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Тема статусных _иконок:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Стиль"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "_Тема:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2142,7 +2037,7 @@ msgstr ""
 "$S заменяется на предыдущее сообщение о статусе\n"
 "$T заменяется на время срабатывания автоматического сообщения о статусе «Ушел»"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2155,366 +2050,381 @@ msgstr ""
 "$T заменяется на время срабатывания автоматического сообщения о статусе "
 "«Недоступен»"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Использовать иконки _транспортов"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Использовать _системный шрифт"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Когда получено новое сообытие:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Сообщение об ошибке: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Ник:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "Авто-_отошел после:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Отображать уведомления о состоянии чата:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Смайлики:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Менеджер файлов:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Игнорировать форматирование во входящих сообщениях"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Записывать в лог изменения статусов контактов"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Почтовый клиент:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "Авто-_недоступен после:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Открыть..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Вернуться к цветам по умолчанию"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Отправлять уведомления о состоянии чата:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Сообщение о статусе:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "_Цвет ссылок:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "Поведение _окна:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "в _комнатах"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "в _ростере"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "минут"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Списки доступа:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Добавить/изменить правило</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Список правил</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Список доступа</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Действует для текущего сеанса"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Действует при каждом запуске Gajim"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "всем"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Все (включая подписку)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Разрешить"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Отклонить"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Номер:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Список доступа"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "всем с подпиской"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "всем в группе"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"нет\n"
-"оба\n"
-"от\n"
-"к"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Оба"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "От"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "один"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "два"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "посылать мне сообщения"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "посылать мне запросы"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "посылать мне свой статус"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "видеть мой статус"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Адрес</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Аватар:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Birthday:</b>"
 msgstr "<b>День рождения:</b>"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Город:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Компания:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Страна:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Отделение:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>Почта:</b>"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Дополнительный адрес:</b>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Фамилия:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Имя</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Имя:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Веб-страница:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Отчество:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Имя:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Ник:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Телефон:</b>"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Должность:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Индекс:</b>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Префикс:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Обязанности:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Штат:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Улица:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Суффикс:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Подробнее"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Установить свою аватару"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: YYYY-MM-DD"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Личная информация"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Работа"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Что вы хотите сделать?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Удалит учетную запись _только из Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Удалить учетную запись из Gajim и с _сервера"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2522,369 +2432,335 @@ msgstr ""
 "<b>someone@somewhere.com</b> хочет <b>добавить</b> несколько контактов в ваш "
 "список контактов."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 "Тело сообщения <в данное время не используется, поэтому по умолчанию не "
 "отображается>"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Обмен контактами"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "_Добавить контакт..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Возможнос_ти"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "_Передачи"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Часто задаваемые вопросы (онлайн)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Помощь онлайн"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Профиль и _аватар"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Показать _только активных"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Показать транс_порты"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Показать _отключенных"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Показать _ростер"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "Учётные _записи"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Содержание"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_ЧаВО"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Помощь"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Настройки"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Выйти"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Отправить одиночное _сообщение..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Вид"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Получаю форму поиска. Подождите..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Поиск"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Добавить _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Информация о контакте"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Поиск"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "_Вперед"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Зарегистрировать в"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "О_тменить"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "От:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Ответить на это сообщение"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Отправить"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Отправить сообщение и закрыть окно"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "К:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "Отправить и _закрыть"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "А_вторизовать"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../data/gui/subscription_request_window.ui.h:2
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Авторизовать контакт (он будет видеть ваш статус)"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Отклонить авторизацию от контакта (Он не сможет видеть ваш статус)"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Запрос подписки"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Отклонить"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Выберите учетную запись для объединения"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 msgid "Select the contacts you want to synchronise"
 msgstr "Расширенные статусы"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Синхронизация : выберите контакт"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Выключить звук"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Отправить _сообщение"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Показать непросмотренные _события"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Ста_тус"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Комната"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Спрашивать:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Клиент:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Время контакта:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Статус:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Подписка:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Система:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Комментарии"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Настроить _аватар:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Информация о контакте"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Еще"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Аватар:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Шрифт</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber Трафик</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Ввод</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-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"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Информация/Запрос"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Сообщение"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Присутствие"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Изменить учетную запись..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Локальный JID:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Личная информация"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Jabber-клиент на GTK+"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Отменить подтверждение"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 "Команда находится в процессе выполнения. Вы уверены, что хотите её отменить?"
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Сервис отправил недопустимые данные"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Сервис изменил идентификатор сеанса."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Сервис ответил ошибкой."
 
@@ -2909,7 +2785,7 @@ msgstr "Целое"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Цвет"
 
@@ -3047,86 +2923,86 @@ msgstr "Шведский"
 msgid "Chinese (Ch)"
 msgstr "Китайский"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Язык проверки орфографии"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/chat_control.py:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Подчеркнутый"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Зачеркнутый"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Удалить форматирование"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Отправить файл?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG шифрование включено"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Не в ростере"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Этот контакт не поддерживает передачу файлов."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 "Необходимо знать настоящий JID контакта для того, чтобы отправить ему или ей "
 "файл."
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Ключ GPG не присвоен"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3134,50 +3010,50 @@ msgstr ""
 "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
 "сообщения с помощью GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG шифрование выключено"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Для сеанса БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Для сеанса НЕ БУДЕТ сохранена история сообщений"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "было"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "НЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "будет"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "НЕ будет"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "и заверено"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3186,23 +3062,23 @@ msgstr ""
 "%(type)s шифрование %(status)s включено %(authenticated)s.\n"
 "Для сеанса %(logged)s сохранена история сообщений."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Установление сеанса отменено"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Сеанс зашифрован"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " и БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " и НЕ БУДЕТ сохранена история сообщений"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3210,25 +3086,25 @@ msgstr ""
 "Личность удаленного контакта не подтверждена. Нажмите на кнопке со щитом для "
 "подробностей."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E шифрование выключено"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Последнее сообщение НЕ БЫЛО зашифровано"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 msgid "The following message was encrypted"
 msgstr "Последнее сообщение зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Получено новое сообщение от «%s»"
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3236,15 +3112,15 @@ msgstr ""
 "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
 "сообщений, то это сообщение будет утеряно."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Ошибка базы данных"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3253,110 +3129,120 @@ msgstr ""
 "Файл базы данных (%s) не может быть прочитан. Попробуйте восстановить его "
 "или удалить (вся история будет утеряна)."
 
-#: ../src/chat_control.py:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s теперь %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "создается БД истории"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "создается БД истории"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s должен быть директорией, а не файлом"
 
-#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Закончить работу"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s должен быть файлом, а не директорией"
 
-#: ../src/common/check_paths.py:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "создается директория %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Изменить информацию о статусе"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Контакт изменит статус"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Установка статуса и статусного сообщения"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Готов поболтать"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "В сети"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Недоступен (расширенный)"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Не беспокоить."
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Не в сети — отключен"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Описание присутствия:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Статус изменён."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Покинуть конференции"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s из комнаты %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Вы не вошли в комнату."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr "Выберите конференции, которые вы хотите покинуть"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Комнаты"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Вы покинули следующие комнаты:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Переслать непрочитанные сообщения"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Все непрочитанные сообщения отправлены."
 
@@ -3451,9 +3337,9 @@ msgstr ""
 "Список (через пробел) строк (учётных записей и групп), которые свёрнуты."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "По_умолчанию"
 
@@ -3747,11 +3633,11 @@ msgstr ""
 "Если активно то Gajim будет отображать сообщение о статусе, если оно не "
 "пустое, для каждого контакта под именем контакта в окне ростера"
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Определяет позицию аватар в ростере. Может быть left или right"
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3759,7 +3645,7 @@ msgstr ""
 "Если активно, то Gajim будет запрашивать аватару для каждого контакта, у "
 "которого её не было в последний раз или она уже слишком старая."
 
-#: ../src/common/config.py:230
+#: ../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."
@@ -3767,7 +3653,7 @@ msgstr ""
 "Если неактивно, то Gajim больше не будет показывать строку статуса в окне "
 "беседы, когда контакт меняет его или её статус и/или сообщение о статусе."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3782,28 +3668,28 @@ msgstr ""
 "«in_and_out», то Gajim будет выводить сообщение только когда кто-то входит "
 "или выходит из комнаты."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Фоновый цвет контакта, который только что вошел."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Фоновый цвет контакта, который только что вышел."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "Если активно, то восстановленные сообщения будут иметь меньший шрифт."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Не показывать аватар для транспорта."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Не показывать ростер в панели задач."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3813,7 +3699,7 @@ msgstr ""
 "мигать (поведение по умолчанию для большинства менеджеров окон) когда "
 "присутствуют не просмотренные события."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3824,7 +3710,7 @@ msgstr ""
 "данных в информации для комнат"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3844,31 +3730,31 @@ msgstr ""
 "свое окно. Заметьте, что при изменении этого параметра требуется перезапуск "
 "Gajim, чтобы изменения вступили в силу."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Если неактивно, вы больше не будете видеть аватары в окне беседы."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Если активно, то нажатие клавиши Escape будет закрывать вкладку/окно."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Скрывает кнопки в окнах чата."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Скрывает баннер в окне комнаты"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Скрывает баннер в окне чата"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Скрывает список посетителей в окне комнаты."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3876,17 +3762,17 @@ msgstr ""
 "Показывать ник в начале строки в чате только если предыдущее сообщение было "
 "написано другим участником."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Разделитель, используемый при активированной настройке "
 "chat_merge_consecutive_nickname."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавно прокручивать сообщения в окне чата"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3894,13 +3780,13 @@ msgstr ""
 "Список цветов, разделенных «:», которые будут использоваться для раскраски "
 "ников в комнатах."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Использовать Ctrl-Tab, чтобы перейти к следующей вкладке с составляемым "
 "сообщением, когда нет непрочитанных сообщений."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3908,7 +3794,7 @@ msgstr ""
 "Следует ли показывать диалог подтверждения о создании метаконтакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3916,7 +3802,7 @@ msgstr ""
 "Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3924,7 +3810,7 @@ msgstr ""
 "Следует ли показывать диалог подтверждения блокировки контакта? Пустая "
 "строка означает, что сообщение не будет показываться вообще."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3935,7 +3821,7 @@ msgstr ""
 "если вы подключитесь с отрицательным приоритетом, то вы НЕ получите никаких "
 "сообщений от сервера."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3943,7 +3829,7 @@ msgstr ""
 "Если активно, Gajim будет использовать (если возможно) Gnome Keyring для "
 "хранения паролей учетных записей."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3951,7 +3837,7 @@ msgstr ""
 "Если активно, Gajim будет использовать (если возможно) KDE Wallet для "
 "хранения паролей учетных записей."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3959,7 +3845,7 @@ msgstr ""
 "Если активно, Gajim будет показывать количество контактов онлайн/всего в "
 "строках с названием учетной записи и групп."
 
-#: ../src/common/config.py:263
+#: ../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"
@@ -3967,7 +3853,7 @@ msgstr ""
 "Может быть пусто, 'chat' или 'normal'. Если не пусто — обрабатывать все "
 "входящие сообщения так, как будто бы они были этого типа."
 
-#: ../src/common/config.py:264
+#: ../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."
@@ -3975,7 +3861,7 @@ msgstr ""
 "Если активно, Gajim прокрутит ростер и выделит контакт, который написал вам "
 "сообщение последним, если окно чата еще небыло открыто."
 
-#: ../src/common/config.py:265
+#: ../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."
@@ -3983,17 +3869,17 @@ msgstr ""
 "Если активно, Gajim будет конвертировать строку между $$ и $$ в изображение, "
 "используя dvips и конвертировать до вставки его в окно чата."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Время не активности прежде чем окно изменения статуса закроется."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr "Максимальное количество строк в окне. Старые строки будут удалены."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4001,17 +3887,17 @@ msgstr ""
 "Если активно, окно уведомления от notification-daemon будет прикреплено к "
 "системному трею."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr "Выберите интервал между 2 проверками на бездействие."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Измените значение для изменения размера отображаемых формул LaTeX."
 
-#: ../src/common/config.py:271
+#: ../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)"
@@ -4019,7 +3905,7 @@ msgstr ""
 "Допустимые uri схемы. Только схемы из этого списка будут приняты как «real» "
 "uri.(mailto и xmpp обрабатываются отдельно)"
 
-#: ../src/common/config.py:272
+#: ../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!"
@@ -4028,13 +3914,13 @@ msgstr ""
 "установлении соединения с учетной записью. ВНИМАНИЕ: Данная опция приводит к "
 "большому количеству посылаемых запросов!"
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Если Активно, автодополнение ников в конференциях будет работать как "
 "автодополнение в командной оболочке"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4043,7 +3929,23 @@ msgstr ""
 "принимать значения «always» (всегда), «when_other_resource» (если другой "
 "ресурс) и «never» (никогда)."
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4051,7 +3953,7 @@ msgstr ""
 "Приоритет будет изменяться автоматически согласно вашему статусу. Приоритеты "
 "для статусов задаются в пункте autopriority_* ."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4059,41 +3961,41 @@ msgstr ""
 "Статус, используемый при автоподключении. Варианты: отключен, в сети, готов "
 "поболтать, отошел, недоступен, не беспокоить, невидимка"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Если включено, восстанавливать последний использованный статус."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Если активно, контакты, запрашивающие авторизацию, будут автоматически её "
 "получать."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Если неактивно, эта учетная запись будет отключена и не будет отображаться в "
 "окне ростера."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Если отключено, не подписывать присутствие ключом GPG, даже если GPG "
 "настроен."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Включить ESessions шифрование для данной учетной записи."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 "Должен ли Gajim по возможности автоматически начинать зашифрованный сеанс?"
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4101,31 +4003,39 @@ msgstr ""
 "Упорядоченный список (разделённый пробелами) типов подключения, которые "
 "будут перепробованы. Может включать tls, ssl или plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
 "через незащищенное соединение."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Предупреждать, прежде чем использовать стандартную библиотеку SSL."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Если отмечено, то Gajim будет будет спрашивать вас перед отправкой пароля "
+"через незащищенное соединение."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Разделенный пробелами список игнорирования ошибок ssl"
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Пробел, посылаемый после бездействия"
 
 # дословно: пинг XMPP послал после бездействия. Возможно, ошибка в оригинале.
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "пинг XMPP, посылаемый после бездействия"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4134,11 +4044,11 @@ msgstr ""
 "соединения."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Костыль для jabberd2"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4146,15 +4056,15 @@ msgstr ""
 "Если отмечено, Gajim будет использовать ваш IP и прокси, определенные в "
 "параметре file_transfer_proxies для передачи файлов"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Отвечать на запросы уведомления"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Посылать запросы уведомления"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4162,11 +4072,16 @@ msgstr ""
 "Когда устанавливается зашифрованный сеанс, должен ли Gajim предположить, что "
 "вы хотите сохранить историю сообщений?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Заполните данные о контакте, который вы хотите добавить"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Используется ли для этого контакта OpenPGP?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4174,101 +4089,101 @@ msgstr ""
 "Должен ли Gajim по возможности автоматически начинать для данного контакта "
 "зашифрованный сеанс?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Язык, который используется при проверке правописания"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "все или статусы, разделенные пробелом"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "«yes» (да), «no» (нет) или «both» (оба)"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "«yes» (да), «no» (нет) или «» (пусто)"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "В кино"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Смотрю кино"
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Работаю"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Говорю по телефону"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Я здесь."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Я готов поболтать."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Скоро буду."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Меня нет."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Не беспокоить."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4277,97 +4192,89 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, который нужно проигрывать, когда приходит любое сообщение MUC."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "овощной"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "телесный"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "морской"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Не могу загрузить модуль «idle»"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Неверный хост"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Неправильный локальный адрес? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Данные о регистрации для транспорта %s не пришли вовремя."
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Регистрация завершена"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Регистрация сервиса %s завершена успешно"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Ошибка регистрации"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, 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:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Ошибка записи на диск"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Невидимость не поддерживается"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Учетная запись %s не поддерживает невидимость."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Было получено сообщение от неверного JID, оно было проигнорировано."
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4377,7 +4284,7 @@ msgstr ""
 "(см. http://trac.gajim.org/wiki/DatabaseBackup) или удалить (вся история "
 "будет утеряна)."
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Ник недопустим: %s"
@@ -4385,76 +4292,76 @@ msgstr "Ник недопустим: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Не получается войти в комнату"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Было достигнуто максимальное количество пользователей %s"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вам запрещено входить в комнату %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Комнаты %s не существует."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Создание комнат запрещено."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Необходимо использовать ваш зарегистрированный ник в комнате %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас нет в списке членов комнаты %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Комната была удалена"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Взамен, вы можете присоединиться к комнате: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "теперь мы подписались на %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "%s хочет отменить подписку"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "теперь мы отписались от %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4592,27 +4499,27 @@ msgstr "Назначение ключа не включает подписыва
 msgid "Application verification failure"
 msgstr "Ошибка при проверке приложения"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Ни удаленное присутствие не подписано, ни ключ не присвоен."
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Это сообщение *зашифровано* (см. :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4621,76 +4528,76 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с учетной записью «%s» была потеряна"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Переподключаться вручную."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s предоставил другую регистрационную форму"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Неизвестная ошибка SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Неверный ответ"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s неверно ответил на запрос о регистрации: %(error)s"
 
-#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с «%s»"
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер ответил: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Соединение с прокси разорвалось"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не могу соединиться с %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Связь с учетной записью %s была потеряна.Попытка подключения."
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достоверность сертификата %s может быть недействительной."
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4699,7 +4606,7 @@ msgstr ""
 "\n"
 "Ошибка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4708,24 +4615,24 @@ msgstr ""
 "\n"
 "Неизвестная ошибка SSL: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с «%s»"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Проверьте правильность логина и пароля."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Ошибка при удалении списка доступа"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4734,44 +4641,44 @@ msgstr ""
 "Список доступа %s не может быть удален. Возможно, он используется одним из "
 "ваших активных ресурсов. Отключите ресурс и попробуйте снова."
 
-#: ../src/common/connection.py:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Контакт для отправки: «%s» (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Контакты для отправки:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Нельзя получить из-за невидимости"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Ошибка отказа от регистрации"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 "Отказ от регистрации на сервере %(server)s завершился ошибкой: %(error)s"
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Наблюдатели"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Транспорты"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Не в ростере"
 
@@ -4780,37 +4687,53 @@ msgstr "Не в ростере"
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "На компьютере не установлена библиотека D-Bus для Python"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Возможности работы Gajim с D-Bus не могут быть использованы"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus работает не верно на этом компьютере"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "отсутствует библиотека pysqlite2 (или python-pysqlite2). Выход..."
+#: ../src/common/dbus_support.py:54
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: system bus not present"
+msgstr "D-Bus работает не верно на этом компьютере"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "D-Bus работает не верно на этом компьютере"
+
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "База данных не может быть загружена."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Сервис недоступен: Gajim не запущен или отключена функция удаленного "
 "управления (настройка remote_control)"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "На машине отсутствует D-Bus или модуль питона для нее"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Шина D-Bus не доступна.\n"
+"Попробуйте прочитать http://trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Шина D-Bus не доступна.\n"
 "Попробуйте прочитать http://trac.gajim.org/wiki/GajimDBus"
@@ -4978,206 +4901,206 @@ msgstr "Конец недели"
 msgid "Weekend!"
 msgstr "Выходные!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Неверный символ в имени пользователя."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Требуется адрес сервера."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Неверный символ в имени сервера"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Неверный символ в ресурсе"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Занят"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Занят"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Недоступен"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Готов поболтать"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Готов поболтать"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Доступен"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Доступен"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Соединяюсь"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "_Ушел"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Отключен"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Отключен"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Невидимка"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "Ошибка"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "К"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Оба"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Нет"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Подписаться"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Отсутствует"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Модераторы"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Участники"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Посетители"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Посетитель"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation:Отсутствует"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Владелец"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Участник"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "читает сообщение"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "занят чем-то еще"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 msgid "is composing a message..."
 msgstr "печатает сообщение..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "перестал печатать сообщение"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "закрыл окно чата или вкладку"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5185,22 +5108,22 @@ msgstr[0] "%d пропущенное сообщение"
 msgstr[1] "%d пропущенных сообщения"
 msgstr[2] "%d пропущенных сообщений"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " в комнате %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " от пользователя %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " от %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5208,12 +5131,49 @@ msgstr[0] "%d событие пропущено"
 msgstr[1] "%d события пропущено"
 msgstr[2] "%d событий пропущено"
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim — %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Настройки комнаты"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Ошибка выполнения «%(command)s»: %(error)s"
@@ -5223,17 +5183,74 @@ msgstr "Ошибка выполнения «%(command)s»: %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s не является допустимым loglevel"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Сообщение по умолчанию"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Размер: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "синий"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "переносим журнал на индексы"
 
@@ -5870,19 +5887,19 @@ msgstr "Учусь"
 msgid "Writing"
 msgstr "Пишу"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Неизвестный исполнитель"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Неизвестная песня"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Неизвестный альбом"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5892,12 +5909,12 @@ msgstr ""
 "из <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:91
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Не могу привязаться к порту %s."
 
-#: ../src/common/socks5.py:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5905,7 +5922,7 @@ msgstr ""
 "Возможно, запущен ещё один экземпляр Gajim. Передача файлов будет отменена."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5975,24 +5992,20 @@ msgstr "Не удалось соединиться с хостом: истекл
 msgid "Error while adding service. %s"
 msgstr "Ошибка при добавлении службы. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Отключены"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Сообщение по умолчанию"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Включено"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Нет словаря для языка %s"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6001,216 +6014,216 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "заголовок сообщения о статусе"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "текст сообщения о статусе"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Переподключиться сейчас?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Если вы хотите, чтобы изменения были применены немедленно, вы должны "
 "переподключиться."
 
-#: ../src/config.py:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "Невозможно использовать OpenPGP на этом компьютере"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Непросмотренные события"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Просмотрите все ожидающие события перед удалением учетной записи."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "У вас есть окна чата под учётной записью %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Все окна чатов и комнат будут закрыты. Продолжить?"
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для смены имени учетной записи необходимо просмотреть ожидающие события."
 
-#: ../src/config.py:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Это имя уже используется в другой вашей учетной записи. Выберите другое."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Переименовать учетную запись"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введите новое название для учетной записи %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат «имя_пользователя@сервер»."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Нет секретного ключа OpenPGP."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Выбор ключа OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой ключ OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Чтобы отредактировать личную информацию, нужно подключиться к серверу."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Сервер не поддерживает Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не может хранить личную информацию."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr ""
 "Чтобы отключить эту учетную запись, необходимо отсоединиться от сервера."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Учётная запись Local уже существует."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Переименуйте или удалите её, прежде чем включать локальные сообщения."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Черный список"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Список участников"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Список владельцев"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Список администраторов"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Причина"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Ник"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Обязанность"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Баню..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6218,11 +6231,11 @@ msgstr ""
 "<b>Кого вы хотите забанить?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Добавляю участника..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6230,11 +6243,11 @@ msgstr ""
 "<b>Кого вы хотите сделать участником?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Добавляю владельца..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6242,11 +6255,11 @@ msgstr ""
 "<b>Кого вы хотите сделать владельцем?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Добавляю администратора..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6254,7 +6267,7 @@ msgstr ""
 "<b>Кого вы хотите сделать администратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6270,59 +6283,87 @@ msgstr ""
 "4. domain (сам домен, т.е. как любое сочетание user@domain,\n"
 "domain/resource, так и адрес, содержащий этот поддомен)"
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Смайлики выключены"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Требуется пароль"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись «%s» подключена к серверу"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Соединение с прокси разорвалось"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Что вы хотите сделать?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Удалит учетную запись _только из Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "По умолчанию"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Все"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Только приход и уход"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Нет"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Новая комната"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6330,27 +6371,27 @@ msgstr ""
 "эту закладку."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Символ недопустим"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Неверный сервер"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Неверная комната"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Учетная запись успешно добавлена"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6360,32 +6401,32 @@ msgstr ""
 "«Дополнительно», или сделать это позже посредством пункта «Учетные записи» "
 "меню «Правка» в главном окне программы."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Укажите сервер, на котором вы хотите зарегистрироваться."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Сертификат уже находится в файле"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Этот сертификат уже есть в файле %s, поэтому он не был добавлен."
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6400,7 +6441,7 @@ msgstr ""
 "Ошибка SSL: %(error)s\n"
 "Соединиться с этим сервером?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6411,59 +6452,59 @@ msgstr ""
 "Отпечаток SHA1 сертификата:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "У вас уже есть учетная запись с таким именем."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Получено первое сообщение"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Следующее сообщение получено в окне с фокусом"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Следующее сообщение получено в окне без фокуса"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Контакт подключился"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Контакт отключился"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Сообщение отправлено"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Вас упомянули в комнате"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Получено сообщение в комнате"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Получено письмо на Gmail"
 
@@ -6485,44 +6526,44 @@ msgstr ""
 "Текст под этой линией был сказан после того,\n"
 "как вы последний раз заглядывали в эту комнату"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Цитировать"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Действия для «%s»"
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _словаре"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "В URL Web-поиска отсутствует «%s»"
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Открыть как _ссылку"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6531,7 +6572,7 @@ msgstr[1] "Вчера"
 msgstr[2] "Вчера"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -6637,66 +6678,66 @@ msgstr ""
 "Заполните данные о контакте,\n"
 "который хотите добавить в ростер учетной записи %s"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Заполните данные о контакте, который вы хотите добавить"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Неверный ID пользователя"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "ID пользователя не должен содержать ресурс."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Вы не можете добавлять себя в свой ростер."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Контакт уже в ростере"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Этот контакт уже содержится в вашем ростере."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ID пользователя:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Jabber-клиент на GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Версия GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Версия PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Разработчики:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Разработчики прошлых версий:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "БЛАГОДАРНОСТИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Яков Безруков <nebulam51@gmail.com>\n"
@@ -6705,7 +6746,7 @@ msgstr ""
 "Денис Фомин <fominde@mail.ru>\n"
 "Григорий Сарницкий <sargrigory@ya.ru>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6716,100 +6757,100 @@ msgstr ""
 "Чтобы воспользоваться проверкой правописания, установите словарь для языка %"
 "s или выберите другой язык, исправив настройку speller_language."
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запрос на подписку для учетной записи %(account)s от %(jid)s"
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Войти в комнату с учетной записи %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Выберите учетную запись, с которой вы хотите войти в комнату."
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Неверное имя пользователя"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Неверное имя комнаты"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "В Jabber ID комнаты или сервера содержатся недопустимые символы."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Это не комната"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не является именем комнаты."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Чтобы объединить контакты, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Учётная запись не подключена к серверу"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Вы не можете синхронизировать учетную запись если она не подключена."
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Синхронизировать"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Начать чат с учетной записью %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Начать чат"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6817,173 +6858,171 @@ msgstr ""
 "Введите ник или ID пользователя, которому вы хотите отправить сообщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Соединение недоступно"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Удостоверьтесь, что вы подключены к «%s»."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Неверный JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не понимаю адреса «%s»."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Чтобы изменить пароль, необходимо подключиться к серверу."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Необходимо ввести пароль."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля, должны быть одинаковыми."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Контакт подключился"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Контакт отключился"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Новое сообщение"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Новое одиночное сообщение"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Новое личное сообщение"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Новое письмо"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Запрос передачи"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Ошибка передачи"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Передача файла завершена"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Приглашение в комнату"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Контакт изменит статус"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Новое сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Новое сообщение для учетной записи %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Получено %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Консоль XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Грустный"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Изменить"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Удалить"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6991,152 +7030,152 @@ msgid ""
 msgstr "<b>%s</b> хочет <b>%s</b> несколько контактов в ваш список контактов."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Добавить"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Изменить"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Удалить"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Группы"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s предложил мне добавить вас в мой список контактов."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Добавить _контакт"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Удаляет контакт из ростера"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Список доступа <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Список доступа для %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Номер: %(order)s, действие: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Изменить правило</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Добавить правило</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки доступа для %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Списки доступа"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Недопустимое имя списка"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Необходимо ввести имя для нового списка доступа."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Вы приглашены в конференцию"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact приглашает вас присоединиться к обсуждению."
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact приглашает вас в комнату %(room_jid)s."
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Вы принимаете приглашение?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Выберите звуковой файл"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "В формате Wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Выбрать картинку"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Когда %s происходит:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Добавление специального уведомления для %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "№"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Условие"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "когда я "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7147,19 +7186,19 @@ msgstr ""
 "\n"
 "Short Authentication String данного сеанса <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Вы уже удостоверили личность этого контакта."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Личность контакта удостоверена"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Удостоверить снова..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7169,19 +7208,19 @@ msgstr ""
 "сообщения или послать сообщения вам, вы должны удостоверить личность "
 "собеседника, нажав кнопку, расположенную ниже."
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Личность контакта НЕ удостоверена"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Удостоверить..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Вы удостоверили личность удаленного контакта?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7196,23 +7235,23 @@ msgstr ""
 "\n"
 "Short Authentication String этого сеанса <b>%(sas)s</b>"
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Вы переговорили с удаленным контактом и удостоверили SAS?"
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Этому контакту не присвоен ключ GPG, поэтому вы не можете зашифровать "
 "сообщения."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7221,7 +7260,7 @@ msgstr ""
 "Таким образом, сообщения <b>не могут быть</b> зашифрованы. Воспользуйтесь "
 "вашим GPG клиентом для того, чтобы выставить доверие данному ключу"
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7229,52 +7268,52 @@ msgstr ""
 "Этому контакту присвоен ключ GPG, и вы доверяете этому ключу. Таким образом, "
 "сообщения будут зашифрованы."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Другие"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Комнаты"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подключиться к серверу"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Обзор сервисов с учётной записи %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Обзор сервисов (discovery)"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Сервис не обнаружен"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7282,93 +7321,97 @@ msgstr ""
 "По этому адресу сервисы отсутствуют или не отвечают. Проверьте адрес и "
 "попробуйте еще раз."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Сервис недоступен для просмотра"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Неверное имя сервера"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Просмотр %(address)s с учетной записью %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Браузер"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "В_ыполнить команду..."
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "За_регистрироваться"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Сканирую %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Пользователи"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Описание"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "Добавить эту комнату в _закладки"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Закладка уже установлена"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Комната «%s» уже есть в ваших закладках."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Закладка успешно добавлена"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню «Действия» в ростере."
 
-#: ../src/disco.py:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Подписка"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Узел"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Новое сообщение"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Отписаться"
 
@@ -7420,7 +7463,7 @@ msgstr "Требует python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Эта возможность отсутствует в Windows."
 
@@ -7587,102 +7630,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Требует python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Кликабельные ссылки"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr "Кликабельные ссылки в баннере."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Требует python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Требует python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Функции"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Файл"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Время"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Прогресс"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Вы"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Получатель:"
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сохранено в: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Открыть папку с принятым файлом"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Передача отменена"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "Соединение не может быть установлено."
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Получатель: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Сообщение об ошибке: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Передача файла остановлена"
 
@@ -7690,7 +7721,7 @@ msgstr "Передача файла остановлена"
 msgid "Choose File to Send..."
 msgstr "Выбрать файл для отправки..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Описание: "
 
@@ -7722,33 +7753,33 @@ msgstr "Описание: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправить вам файл:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не могу заместить существующий файл «%s»"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Этот файл уже существует, и у вас нет права его перезаписать."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Файл уже существует"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Папка «%s» не доступна для записи"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "У вас нет права создавать файлы в этой директории."
 
@@ -7784,69 +7815,56 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Имя: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Отправитель:"
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Продолжить"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim для запуска требуется X-сервер. Выход..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "ошибка импортирования PyGTK: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim требуется PyGTK 2.12 или выше"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется PyGTK 2.12 или выше. Выход..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim требуется GTK 2.12 или выше"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется GTK 2.12 или выше. Выход..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "У GTK отсутствует поддержка libglade."
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Удалите вашу текущую версию GTK и установите последнюю стабильную версию с %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Удостоверьтесь, что GTK+ и PyGTK поддерживают libglade."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim для запуска требуется PySQLite2"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim для запуска требуется pywin32"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7856,11 +7874,11 @@ msgstr ""
 "его на сайте: %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim уже запущен"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7903,8 +7921,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "Учетные записи"
 
@@ -7926,13 +7944,16 @@ msgid "status"
 msgstr "статус"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "сообщение"
 
@@ -8171,70 +8192,89 @@ 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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Обработать ссылку формата «xmpp:/»"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI для обработки"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr "Учетная запись, в которой вы хотите его использовать"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Cодержимое сообщения"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Присоединиться к комнате MUC"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "комната"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID комнаты"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "Ник"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Используемый ник"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "Пароль:"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Пароль для входа в комнату"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr "Выберите учетную запись, с которой вы хотите войти в комнату"
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Проверить, запущен ли Gajim"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Скрывает или показывает окно ipython"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент «JID контакта»"
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8243,15 +8283,15 @@ msgstr ""
 "'%s' не в вашем ростере.\n"
 "Укажите учетную запись для отправки сообщения."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "У вас нет ни одной активной учетной записи"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "По-видимому, Gajim не запущен. Вы не можете использовать gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8260,16 +8300,16 @@ msgstr ""
 "Использование: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Аргументы:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s не найден"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8278,7 +8318,7 @@ msgstr ""
 "Использование: %s команда [аргумента]\n"
 "Команда одна из:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8287,7 +8327,7 @@ msgstr ""
 "Много аргументов. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8296,7 +8336,11 @@ msgstr ""
 "Аргумент «%(arg)s» не задан. \n"
 "Наберите «%(basename)s help %(command)s» для справки"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Неверный хост"
 
@@ -8325,174 +8369,175 @@ msgstr "Вы не можете удалить вашу текущую тему"
 msgid "Please first choose another for your current theme."
 msgstr "Выберите сначала другую тему."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Вставить ник"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Беседа с "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Возобновлённая беседа"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Любой участник может увидеть ваш настоящий JID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Новая комната была создана"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер присвоил или изменил ваш ник в комнате"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил(а) %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s теперь известен как %(new_nick)s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s выгнали из комнаты (%(reason)s)"
 
-#: ../src/groupchat_control.py:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "ранг изменен"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "настройки комнаты были изменены на 'только для участников'"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "выключение системы"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Ранг %(nick)s был изменен на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Обязанности %(nick)s были изменены на %(role)s"
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s зашёл в комнату"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 теперь %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Вы точно хотите выйти из комнаты «%s»?"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1690
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
 
-#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "Не _переспрашивать"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Смена темы"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Введите новую тему:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Смена ника"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Введите новый ник, который вы хотите использовать:"
 
 # смотря где вылазит меседж - нужно присмотреться
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Удаление %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8500,22 +8545,22 @@ msgstr ""
 "Вы собираетесь полностью уничтожить эту комнату.\n"
 "Можете указать причину:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Можете указать альтернативную комнату:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Выгоняем %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -8536,61 +8581,61 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Сообщить об ошибке"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Детали"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Ошибка чтения файла:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 msgid "Error parsing file:"
 msgstr "Ошибка обработки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не является основным jabber-клиентом"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Вы хотите сделать Gajim основным jabber-клиентом?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Всегда проверять при запуске является ли Gajim основным jabber-клиентом"
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Расширение не поддерживается"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Сохранить изображение как..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8601,58 +8646,58 @@ msgstr ""
 "другим пользователем.\n"
 "Укажите другой ник:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Всегда использовать этот ник в случае конфликта"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Вы принимаете запрос %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Авторизация для %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Соединение разорвалось"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "ошибка при отправке %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Запрос подписки"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» авторизовал вас, теперь вы можете видеть его статус."
 
-#: ../src/gui_interface.py:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» отозвал подписку с вами"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8660,60 +8705,60 @@ msgstr ""
 "Вы всегда будете видеть его или её как отключенными.\n"
 "Удалить его или её из контакт-листа?"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "От подписки отказался"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с «%s» не может быть установлена"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s установил(а) тему: %(subject)s"
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Теперь в комнате отображается недоступный участник"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "теперь в комнате не отображаются недоступные участники"
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Запись логов конференции включена"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Запись логов конференции выключена"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Конференция не анонимна"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Конференция частично анонимна"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Конференция полностью анонимна"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Чтобы войти в комнату %s, нужен пароль."
 
-#: ../src/gui_interface.py:1137
+#: ../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"
@@ -8721,23 +8766,23 @@ msgstr ""
 "Gajim настроен на использование GPG агента, но GPG агент не запущен или он "
 "возвратил неверный пароль.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без ключа OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Ваша парольная фраза неверна"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Парольная фраза OpenGPG неверна"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "Ключ GPG не является доверенным"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8745,20 +8790,21 @@ msgstr ""
 "Ключ GPG используемый для шифрования не является доверенным. Вы "
 "действительно хотите зашифровать эти сообщения?"
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 "Gnome Keyring установлен, но некорректно запущен (возможно неверно "
 "установлена переменная среды)"
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Новое письмо на %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8766,7 +8812,7 @@ msgstr[0] "У вас есть %d непрочитанное письмо"
 msgstr[1] "У вас есть %d непрочитанных письма"
 msgstr[2] "У вас есть %d непрочитанных писем"
 
-#: ../src/gui_interface.py:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8781,42 +8827,42 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправить вам файл."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Удаленный контакт остановил передачу"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Ошибка открытия файла"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получен файл %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1454
+#: ../src/gui_interface.py:1479
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: ../src/gui_interface.py:1467
+#: ../src/gui_interface.py:1492
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил(а) отправленный вами файл %(filename)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1471
+#: ../src/gui_interface.py:1496
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: ../src/gui_interface.py:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8825,36 +8871,36 @@ msgstr ""
 "Не удалось расшифровать сообщение от %s\n"
 "Возможно, оно было испорчено."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Сообщение не удалось расшифровать"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Введите новое имя пользователя для локальной учетной записи"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s сек.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Ошибка."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Такое имя уже есть"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8862,21 +8908,22 @@ msgstr ""
 "Вы уже подсоединены к этой учетной записи с таким же ресурсом. Введите "
 "другой ресурс"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s хочет отправить вам файл."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запрос передачи"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Ошибка при проверке SSL сертификата"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8887,15 +8934,15 @@ msgstr ""
 "s\n"
 "Вы всё ещё хотите подключиться к этому серверу?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Игнорировать эту ошибку для данного сертификата."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Ошибка SSL сертификата"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8911,21 +8958,27 @@ msgstr ""
 "Новый отпечаток: %(new)s\n"
 "Вы всё ещё хотите соединиться и обновить отпечаток сертификата?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Небезопасное соединение"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
-msgstr "Вы хотите отправить пароль через небезопасное соединение. Вы уверены?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, я действительно хочу соединиться небезопасно"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -8933,27 +8986,34 @@ msgstr ""
 "Вы хотите отправить пароль через небезопасное соединение. Вы уверены? "
 "(Установите PyOpenSSL, чтобы этого не происходило.)"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+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"
 msgstr "PEP узел не был удален"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP узел %(node)s не был удален: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Смайлики выключены"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Тема смайликов не найдена, они будут отключены."
 
-#: ../src/gui_interface.py:2570
+#: ../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 "
@@ -8962,30 +9022,30 @@ msgstr ""
 "Смайлики не могут быть загружены. Возможно, вам нужно обновить формат файла "
 "emoticons.py. Подробности на http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Требуется парольная фраза"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введите пароль для ключа %(keyid)s (аккаунт %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "Срок действия ключа GPG истёк"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr ""
@@ -8993,11 +9053,11 @@ msgstr ""
 "использования OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Неверная парольная фраза"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Введите парольную фразу для GPG еще раз или нажмите «Отмена»."
 
@@ -9005,44 +9065,44 @@ msgstr "Введите парольную фразу для GPG еще раз и
 msgid "_New Group Chat"
 msgstr "В _новую комнату"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Вы не против, если я добавлю Вас к себе в ростер?"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Не могу найти базу данных истории"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Контакты"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Ник"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Сообщение"
 
-#: ../src/history_manager.py:248
+#: ../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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9056,27 +9116,27 @@ msgstr ""
 "\n"
 "Если вы нажали ДА, пожалуйста подождите..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Экспортирую историю..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s в %(time)s сказал: %(message)s\n"
 
-#: ../src/history_manager.py:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Это необратимая операция"
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Вы точно хотите удалить выделенное сообщение?"
@@ -9116,35 +9176,35 @@ msgstr "Статус установлен в: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Не могу загрузить изображение"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Изображение слишком большое"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Вы собираетесь закрыть несколько вкладок"
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Действительно закрыть их всех?"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Чаты"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Комнаты"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Личные беседы"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Сообщения"
 
@@ -9156,22 +9216,22 @@ msgstr "— сообщения будут записаны в лог"
 msgid "- messages will not be logged"
 msgstr "— сообщения не будут записаны в лог"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s меняет статус"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s подключается"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s отключается"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
@@ -9196,7 +9256,7 @@ msgstr "Новое сообщение от %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Новое сообщение от %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Игнорировать"
 
@@ -9204,18 +9264,18 @@ msgstr "Игнорировать"
 msgid "Retrieving profile..."
 msgstr "Получаю данные..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Пустой файл"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Файл не существует"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Не могу загрузить изображение"
 
@@ -9246,51 +9306,51 @@ msgid ""
 msgstr ""
 "При публикации вашей личной информации произошла ошибка, попробуйте позже."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь «%s» будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если «%s» примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь «%s» всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG использовать невозможно"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9298,27 +9358,38 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать невидимым?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "не синхронизировано"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Закрыть Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Вы точно хотите закрыть Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Всегда закрывать Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Отменить передачу"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9326,16 +9397,16 @@ msgstr ""
 "Сообщения будут доступны для чтения позже, если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Просмотрите все ожидающие события перед удалением транспорта."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт «%s» будет удален"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9343,11 +9414,11 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Транспорты будут удалены"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9356,11 +9427,11 @@ msgstr ""
 "У вас больше не будет возможности приема и отправки сообщений через эти "
 "транспорты:%s."
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Вы точно хотите заблокировать контакт?"
 
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9369,57 +9440,57 @@ msgstr ""
 "него сообщения."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Переименовать контакт"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введите новый ник для контакта %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Переименовать группу"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введите новое название для группы %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Удалить группу"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Вы точно хотите удалить группу %s из ростера?"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Удалить из ростера все контакты в этой группе"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Назначить ключ OpenPGP"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ, который будет применен к контакту"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» будет удален из вашего ростера"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9428,11 +9499,11 @@ msgstr ""
 "не сможет видеть ваш статус."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Продолжить?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9440,16 +9511,16 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, чтобы этот контакт видел мой статус после удаления"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Контакты будут удалены из вашего ростера"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9459,35 +9530,36 @@ msgstr ""
 "Одновременно вы удалите и авторизацию, то есть они всегда будут видеть вас в "
 "оффлайне."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 "Этот контакт будет временно видеть ваш статус как %(status)s, но лишь пока "
 "вы не измените свой глобальный статус. Тогда этому контакту станет виден "
 "глобальный статус."
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Нет доступной учетной записи"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Сервер не умеет хранить метаконтакты"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9495,12 +9567,12 @@ msgstr ""
 "Ваш сервер не умеет хранить данные о метаконтактах. Они будут утеряны при "
 "следующем подключении."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Вы точно хотите создать метаконтакт?"
 
-#: ../src/roster_window.py:3986
+#: ../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 "
@@ -9510,11 +9582,11 @@ msgstr ""
 "Обычно используется, когда один и тот же человек имеет несколько учетных "
 "записей в Jabber или на транспортах."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Неверный файл:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9522,12 +9594,12 @@ msgstr[0] "Хотите отправить файл %s:"
 msgstr[1] "Хотите отправить файлы %s:"
 msgstr[2] "Хотите отправить файлы %s:"
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Отправить %s контакту %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Обьединить %s и %s в метаконтакт"
@@ -9537,126 +9609,130 @@ msgstr "Обьединить %s и %s в метаконтакт"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "для учетной записи %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "учетной записи %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Управление _закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Изменить сообщение о статусе"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Музыка"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Музыка"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Настроить Сервисы..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Развернуть все"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "_Отправить сообщение группе"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Всем пользователям"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Всем, кто подключён"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Управление контактами"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Редактировать _группы"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Отправить одиночное сообщение"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Управление транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Изменить транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "П_ереименовать"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "Развернут_ь"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Переподсоеденится"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Выйти"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Менеджер истории"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Войти в новую комнату"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Изменить сообщение о статусе..."
 
@@ -9687,13 +9763,13 @@ msgid "Confirm these session options"
 msgstr "Подтвердить данные настройки сеанса"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Удаленный клиент хочет установить сеанс со следующими параметрами:\n"
 "\n"
@@ -9716,116 +9792,126 @@ msgstr ""
 "\n"
 "Продолжить этот сеанс?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Изменить сообщение о статусе..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "в _ростере"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s этой комнаты"
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr "[заблокировано]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr "[свернуто]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Статус: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Последний статус: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " с %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Соединение"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Контакт отключился"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Подписка: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Слушаю:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Уведомления"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Скачать"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Загрузить"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Передано: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Не начато"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Остановлено"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "Приостановлено"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Ожидание"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Передается"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Этот сервис еще не сообщил информацию о себе"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9833,28 +9919,28 @@ msgstr ""
 "Этот сервис не может предоставить подробную информацию о себе. \n"
 "Скорее всего, он устарел или сломан"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Time:Неизвестно"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "с %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Ранг:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9862,7 +9948,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9870,29 +9956,381 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
 #. None
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ни вы, ни ваш контакт не желаете знать о присутствии друг друга"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Нет ожидающего запроса на подписку."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Войти в _комнату"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Добавить контакт..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Просмотреть сервисы"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "В_ыполнить команду..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Редактировать учетную запись"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Расширенный статус"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Начать беседу"
+
+#~ msgid "_Status"
+#~ msgstr "_Статус"
+
+#~ msgid "Account Modification"
+#~ msgstr "Изменение учетной записи"
+
+#~ msgid ""
+#~ "Check this so Gajim will connect in port 5223 where legacy servers are "
+#~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+#~ "default if broadcasted by the server, and with this option enabled TLS "
+#~ "will be disabled"
+#~ msgstr ""
+#~ "Если отмечено, то Gajim будет соединяться с портом 5223, на котором "
+#~ "старые сервера обычно ожидают подключения по SSL. Заметьте, что Gajim "
+#~ "использует TLS шифрование по умолчанию, если сервер предоставляет такую "
+#~ "возможность, с этой же опцией TLS отключается"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Редактировать личную информацию..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Хост: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на "
+#~ "чтение только для вас"
+
+#~ msgid "Port: "
+#~ msgstr "Порт: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Прокси:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Сохранить _парольную фразу (небезопасно)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Отправить пинг"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Использовать _SSL (устарело)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "В _зависимости от статуса"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Удалить сообщение дня"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Отправить сообщение сервера"
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Получено сообщение\n"
+#~ "Контакт отключился\n"
+#~ "Контакт сменил статус\n"
+#~ "Упоминание в комнате\n"
+#~ "Сообщение в комнате\n"
+#~ "Запрос на передачу файла\n"
+#~ "Начата передача файла\n"
+#~ "Завершена передача файла"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "контакт(ы)\n"
+#~ "группа(ы)\n"
+#~ "все"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Войти в _комнату"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Скопировать JID/почтовый адрес"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Копировать адрес ссылки"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Отправить письмо"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Просмотреть ссылку в браузере"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Начать беседу"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Учетная запись\n"
+#~ "Группа\n"
+#~ "Контакт\n"
+#~ "Баннер в окне чата"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Изменить _ник"
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Изменить _тему"
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Настроить _комнату"
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Уничтожить комнату"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Управление комнатой"
+
+#~ msgid "Send _File"
+#~ msgstr "Отправить _файл"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Добавить в ростер"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Отправить личное сообщение"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Введите JID или имя контакта\n"
+#~ "История конференций\n"
+#~ "История всех чатов"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Управление учетными записями"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Добавить контакт в ростер (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Добавить комнату в закладки (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Открыть историю чата (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Изменить тему (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Изменить ник (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Пригласить к беседе (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Отправить файл (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Показать набор смайлов (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Показать список форматирования"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Показать меню дополнительных функций (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Показать информацию о контакте (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Все состояния чата\n"
+#~ "Только печать\n"
+#~ "Отключено "
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Определять автоматически при каждом запуске Gajim\n"
+#~ "Всегда использовать приложения GNOME по умолчанию\n"
+#~ "Всегда использовать приложения KDE по умолчанию\n"
+#~ "Всегда использовать приложения Xfce по умолчанию\n"
+#~ "Другое"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Отдельно ростер и отдельно каждое окно чата\n"
+#~ "Отдельно ростер и отдельно одно окно с чатами\n"
+#~ "Всё в одном окне\n"
+#~ "Отдельно ростер и окна чатов сгруппированных по учетной записи\n"
+#~ "Отдельно ростер и окна чатов сгруппированных по типу"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Показать всплывающее окно\n"
+#~ "Сообщить мне об этом\n"
+#~ "Показать в ростере"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "нет\n"
+#~ "оба\n"
+#~ "от\n"
+#~ "к"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "_Добавить контакт..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Возможнос_ти"
+
+#~ msgid "File _Transfers"
+#~ msgstr "_Передачи"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Профиль и _аватар"
+
+#~ msgid "_Accounts"
+#~ msgstr "Учётные _записи"
+
+#~ msgid "_Contents"
+#~ msgstr "_Содержание"
+
+#~ msgid "_FAQ"
+#~ msgstr "_ЧаВО"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Настройки"
+
+#~ msgid "_Quit"
+#~ msgstr "_Выйти"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Отправить одиночное _сообщение..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Отправить _сообщение"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Ста_тус"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Комната"
+
+#~ msgid "Enable"
+#~ msgstr "Включить"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Изменить учетную запись..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Неверный хост"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Неправильный локальный адрес? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "отсутствует библиотека pysqlite2 (или python-pysqlite2). Выход..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Кликабельные ссылки"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr "Кликабельные ссылки в баннере."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Требует python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "У GTK отсутствует поддержка libglade."
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Удалите вашу текущую версию GTK и установите последнюю стабильную версию "
+#~ "с %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr "Удостоверьтесь, что GTK+ и PyGTK поддерживают libglade."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim для запуска требуется PySQLite2"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Входящее сообщение:"
 
@@ -10100,12 +10538,6 @@ msgstr " ресурс с приоритетом "
 #~ msgid "Message Body"
 #~ msgstr "Сообщение"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Всегда использовать приложения OS/X по умолчанию"
-
-#~ msgid "Custom"
-#~ msgstr "Другое"
-
 #~ msgid "Generic"
 #~ msgstr "Общие"
 
diff --git a/po/sk.po b/po/sk.po
index 30283a791..8abee1002 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-07 19:14+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -17,6 +17,2694 @@ 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
+msgid "_Open Gmail Inbox"
+msgstr "_Otvoriť Gmail Inbox"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:1
+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:4
+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
+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:7
+msgid "@"
+msgstr "@"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:8
+msgid ""
+"Add this certificate to the list of trusted certificates.\n"
+"SHA1 fingerprint of the certificate:\n"
+msgstr ""
+"Pridať tento certifikát do zoznamu dôverných certifikátov.SHA1 odtlačok "
+"certifikátu:\n"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:11
+msgid "Anon_ymous authentication"
+msgstr "Anon_ymná autentifikácia"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:12
+msgid "Connect when I press Finish"
+msgstr "Pripojiť, keď stlačím Dokončiť"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:13
+msgid "Gajim: Account Creation Wizard"
+msgstr "Gajim: Pomocník - Tvorba účtu"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:14
+msgid "I already have an account I want to _use"
+msgstr "Už mám účet a chcem ho po_užívať"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:15
+msgid "I want to _register for a new account"
+msgstr "Chcem si za_registrovať nový účet"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:16
+#: ../data/gui/accounts_window.ui.h:25
+msgid "If checked, Gajim will remember the password for this account"
+msgstr "Ak je zaškrtnuté, Gajim si zapamätá heslo pre tento účet"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:17
+msgid "Manage..."
+msgstr "Spravovať..."
+
+#: ../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 "Žiadny"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
+msgid "Prox_y:"
+msgstr "Prox_y:"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
+msgid "Save pass_word"
+msgstr "Uložiť hes_lo"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:21
+msgid "Set my profile when I connect"
+msgstr "Nastaviť môj profil, keď som pripojený"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:22
+msgid "Use custom hostname/port"
+msgstr "Použiť vlastný názov hostiteľa/portu"
+
+#: ../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."
+msgstr ""
+"Potrebujete mať účet, aby ste sa mohli pripojiť\n"
+"do siete Jabber."
+
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
+msgid "_Advanced"
+msgstr "_Pokročilé"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:26
+msgid "_Finish"
+msgstr "_Dokončiť"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:27
+msgid "_Hostname:"
+msgstr "Názov _hostiteľa:"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
+msgid "_Jabber ID:"
+msgstr "_Jabber ID:"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
+msgid "_Password:"
+msgstr "_Heslo:"
+
+#: ../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 "_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:2
+msgid "<b>OpenPGP</b>"
+msgstr "<b>OpenPGP</b>"
+
+#: ../data/gui/accounts_window.ui.h:3
+msgid "<b>Personal Information</b>"
+msgstr "<b>Osobné informácie</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 "_Upraviť  na stav"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
+msgid "Account"
+msgstr "Účet"
+
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Účty"
+
+#: ../data/gui/accounts_window.ui.h:8
+msgid "Administration operations"
+msgstr "Administrátorské operácie"
+
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonymná autentifikácia"
+
+#: ../data/gui/accounts_window.ui.h:10
+msgid "Auto-reconnect when connection is lost"
+msgstr "Automaticky pripojiť, keď zlyhá spojenie"
+
+#: ../data/gui/accounts_window.ui.h:11
+msgid "C_onnect on Gajim startup"
+msgstr "Prip_ojiť sa pri štarte programu Gajim"
+
+#: ../data/gui/accounts_window.ui.h:12
+msgid "Chan_ge Password"
+msgstr "Zme_niť heslo"
+
+#: ../data/gui/accounts_window.ui.h:13
+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."
+
+#: ../data/gui/accounts_window.ui.h:14
+msgid "Choose _Key..."
+msgstr "Vybrať _kľúč..."
+
+#: ../data/gui/accounts_window.ui.h:15
+msgid "Click to change account's password"
+msgstr "Kliknite pre zmenu hesla účtu"
+
+#: ../data/gui/accounts_window.ui.h:16
+msgid "Click to request authorization to all contacts of another account"
+msgstr "Kliknite pre požiadavku autorizácie pre všetky kontakty z iného účtu"
+
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Prip_ojiť sa pri štarte programu Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
+msgid "Connection"
+msgstr "Spojenie"
+
+#: ../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 "Prvé meno:"
+
+#. 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 "Všeobecné"
+
+#: ../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 ""
+"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:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Ak je zaškrtnuté, Gajim bude získavať heslo z GPG agenta podobného ako "
+"seahorse"
+
+#: ../data/gui/accounts_window.ui.h:26
+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:27
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Ak je zaškrtnuté, Gajim sa pri spustení automatický pripojí na jabber na "
+"tento účet"
+
+#: ../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 ""
+"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:29
+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:31
+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:32
+#: ../data/gui/zeroconf_information_window.ui.h:4 ../src/config.py:1775
+#: ../src/dialogs.py:830
+msgid "Jabber ID:"
+msgstr "Jabber ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Posledné meno:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Z_lúčiť účty"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
+msgid "No key selected"
+msgstr "Žiadny kľúč nie je vybraný"
+
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
+msgid "Personal Information"
+msgstr "Osobné informácie"
+
+#: ../data/gui/accounts_window.ui.h:38
+msgid "Priori_ty:"
+msgstr "Priori_ta:"
+
+#: ../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 ""
+"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:40
+msgid "Priority will change automatically according to your status."
+msgstr "Priorita sa zmení automatický podľa stavu."
+
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Preme_novať"
+
+#: ../data/gui/accounts_window.ui.h:42
+msgid "Resour_ce:"
+msgstr "Z_droj:"
+
+#: ../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 ""
+"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:44
+msgid "Save conversation _logs for all contacts"
+msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
+
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Poslať pa_kety na udržiavanie spojenia"
+
+#: ../data/gui/accounts_window.ui.h:47
+msgid "Synch_ronize account status with global status"
+msgstr "Synch_ronizovať stav účtu s globálnym stavom"
+
+#: ../data/gui/accounts_window.ui.h:48
+msgid "Synchroni_ze account status with global status"
+msgstr "Synchroni_zovať stav účtu s globálnym stavom"
+
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Synchronizovať kontakty"
+
+#: ../data/gui/accounts_window.ui.h:50
+msgid "Use G_PG Agent"
+msgstr "Použit G_PG agenta"
+
+#: ../data/gui/accounts_window.ui.h:51
+msgid "Use cust_om hostname/port"
+msgstr "Použiť vlastný názov h_ostiteľa/portu"
+
+#: ../data/gui/accounts_window.ui.h:52
+msgid "Use cust_om port:"
+msgstr "Použiť vlastný p_ort:"
+
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Použiť proxy pre prenos súborov"
+
+#: ../data/gui/accounts_window.ui.h:54
+msgid "_Edit Personal Information..."
+msgstr "_Upraviť osobné informácie..."
+
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
+msgid "_Enable"
+msgstr "_Povoliť"
+
+#: ../data/gui/accounts_window.ui.h:56
+msgid "_Hostname: "
+msgstr "Názov _hostiteľa: "
+
+#: ../data/gui/accounts_window.ui.h:58
+msgid "_Manage..."
+msgstr "_Spravovať..."
+
+#: ../data/gui/accounts_window.ui.h:60
+msgid "_Port: "
+msgstr "_Port: "
+
+#: ../data/gui/accounts_window.ui.h:61
+msgid "_Warn before using an insecure connection"
+msgstr "V_arovať pred použitím nezabezpečeného spojenia"
+
+#: ../data/gui/accounts_window.ui.h:62
+msgid "_use HTTP__PROXY environment variable"
+msgstr "po_užiť premennú prostredia HTTP__PROXY"
+
+#: ../data/gui/add_new_contact_window.ui.h:1
+msgid "A_ccount:"
+msgstr "Úč_et:"
+
+#: ../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"
+
+#: ../data/gui/add_new_contact_window.ui.h:3
+msgid "Add New Contact"
+msgstr "Pridať nový kontakt"
+
+#: ../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: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 ""
+"Musíte sa registrovať pomocou tohto transportu\n"
+"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
+msgid ""
+"You must be connected to the transport to be able\n"
+"to add a contact from this protocol."
+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/adhoc_commands_window.ui.h:1
+msgid "<b>An error has occurred:</b>"
+msgstr "<b>Vyskytla sa chyba:</b>"
+
+#: ../data/gui/adhoc_commands_window.ui.h:2
+msgid "<b>Choose command to execute:</b>"
+msgstr "<b>Vyberte príkaz na vykonanie:</b>"
+
+#: ../data/gui/adhoc_commands_window.ui.h:3
+msgid "Ad-hoc Commands - Gajim"
+msgstr "Ad-hoc príkazy - Gajim"
+
+#: ../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..."
+
+#: ../data/gui/adhoc_commands_window.ui.h:6
+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:7
+msgid "Please wait while the command is sending..."
+msgstr "Prosím počkajte, prebieha odosielanie príkazu..."
+
+#: ../data/gui/adhoc_commands_window.ui.h:8
+msgid "Please wait..."
+msgstr "Prosím čakajte..."
+
+#: ../data/gui/adhoc_commands_window.ui.h:9
+msgid "This jabber entity does not expose any commands."
+msgstr "Táto jabber entita neposkytuje žiadny príkaz."
+
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
+msgid "<b>Description</b>"
+msgstr "<b>Popis</b>"
+
+#: ../data/gui/advanced_configuration_window.ui.h:2
+msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
+msgstr "<b>POZNÁMKA:</b> Musíte reštartovať Gajim, aby boli použité zmeny"
+
+#: ../data/gui/advanced_configuration_window.ui.h:3
+msgid "Advanced Configuration Editor"
+msgstr "Editor rozšírenej konfigurácie"
+
+#: ../data/gui/advanced_configuration_window.ui.h:4
+msgid "Filter:"
+msgstr "Filter:"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
+msgid "Deletes Message of the Day"
+msgstr "Odstráni správu dňa"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
+msgid "Edit _Privacy Lists..."
+msgstr "_Upraviť súkromné zoznamy..."
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
+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:4
+msgid "Set MOTD..."
+msgstr "Nastaviť správu dňa..."
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
+msgid "Sets Message of the Day"
+msgstr "Nastavovať správu dňa"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
+msgid "Show _XML Console"
+msgstr "Zobraziť _XML konzolu"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
+msgid "Update MOTD..."
+msgstr "Aktualizovať správu dňa..."
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
+msgid "Updates Message of the Day"
+msgstr "Aktualizovať správy dňa"
+
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
+msgid "_Administrator"
+msgstr "_Administrátor"
+
+#: ../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:233
+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:243
+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:216
+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
+msgid "_Disable showing event in roster"
+msgstr "Z_akázať zobrazovanie udalostí v zozname"
+
+#: ../data/gui/advanced_notifications_window.ui.h:32
+msgid "_Disable showing event in systray"
+msgstr "Z_akázať zobrazovanie udalostí v oblasti systémových upozornení"
+
+#: ../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
+msgid "_Show event in roster"
+msgstr "_Zobraziť udalosť v zozname"
+
+#: ../data/gui/advanced_notifications_window.ui.h:36
+msgid "_Show event in systray"
+msgstr "_Zobraziť udalosť v oblasti systémových upozornení"
+
+#: ../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"
+
+#: ../data/gui/atom_entry_window.ui.h:1
+msgid "Entry:"
+msgstr "Záznam:"
+
+#: ../data/gui/atom_entry_window.ui.h:2
+msgid "Feed name:"
+msgstr "Názov kanálu:"
+
+#: ../data/gui/atom_entry_window.ui.h:3
+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:124
+msgid "You have received new entry:"
+msgstr "Dostali ste novú položku:"
+
+#: ../data/gui/blocked_contacts_window.ui.h:1
+msgid "Blocked Contacts"
+msgstr "Blokované kontakty"
+
+#: ../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
+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_mood_dialog.ui.h:2
+msgid "<b>Mood:</b>"
+msgstr "<b>Nálada:</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_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>"
+
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
+msgid "Activity:"
+msgstr "Aktivita:"
+
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
+msgid "Mood:"
+msgstr "Nálada:"
+
+#: ../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é..."
+
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
+
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr "1"
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr "2"
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr "3"
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr "4"
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr "5"
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr "6"
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr "7"
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr "8"
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr "9"
+
+#: ../data/gui/chat_control.ui.h:13
+#, fuzzy
+msgid "Mic volume:"
+msgstr "Hlasitosť zvuku:"
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+msgstr "Hlasitosť zvuku:"
+
+#. 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 "_Poslať"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../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: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 ""
+
+#: ../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"
+
+#: ../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: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..."
+
+#. Invite to
+#. Invite to Groupchat
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
+msgid "In_vite to"
+msgstr "Poz_vať do"
+
+#: ../data/gui/contact_context_menu.ui.h:7
+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:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
+msgid "Send Cus_tom Status"
+msgstr "Poslať vlas_tný stav"
+
+#: ../data/gui/contact_context_menu.ui.h:10
+msgid "Send Single _Message..."
+msgstr "Poslať krátku _správu..."
+
+#: ../data/gui/contact_context_menu.ui.h:11
+msgid "Send _File..."
+msgstr "Poslať _súbor..."
+
+#: ../data/gui/contact_context_menu.ui.h:12
+msgid "Set Custom _Avatar..."
+msgstr "Nastaviť vlastný _avatar..."
+
+#: ../data/gui/contact_context_menu.ui.h:13
+msgid "Start _Chat"
+msgstr "Začať _rozhovor"
+
+#: ../data/gui/contact_context_menu.ui.h:14
+msgid "Toggle End to End Encryption"
+msgstr "Prepnúť na End to End šifrovanie"
+
+#: ../data/gui/contact_context_menu.ui.h:15
+msgid "Toggle Open_PGP Encryption"
+msgstr "Prepnúť Open_PGP šifrovanie"
+
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Pridať do zoznamu..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
+msgid "_Allow him/her to see my status"
+msgstr "_Povoliť jemu/jej vidieť môj stav"
+
+#: ../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 "_Blokovať"
+
+#: ../data/gui/contact_context_menu.ui.h:19
+msgid "_Forbid him/her to see my status"
+msgstr "_Odmietnuť jemu/jej zobrazenie stavu"
+
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
+msgid "_History"
+msgstr "_História"
+
+#: ../data/gui/contact_context_menu.ui.h:21
+msgid "_Ignore"
+msgstr "_Ignorovať"
+
+#: ../data/gui/contact_context_menu.ui.h:22
+msgid "_Manage Contact"
+msgstr "S_pravovať kontakt"
+
+#: ../data/gui/contact_context_menu.ui.h:23
+msgid "_Rename..."
+msgstr "_Premenovať..."
+
+#: ../data/gui/contact_context_menu.ui.h:24
+msgid "_Subscription"
+msgstr "_Požiadavky"
+
+#: ../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 "_Odblokovať"
+
+#: ../data/gui/contact_context_menu.ui.h:26
+msgid "_Unignore"
+msgstr "_Neignorovať"
+
+#: ../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/edit_groups_dialog.ui.h:1
+msgid "Edit Groups"
+msgstr "Upraviť skupiny"
+
+#: ../data/gui/esession_info_window.ui.h:1
+msgid "(<b>ESession</b> info)"
+msgstr "(<b>ESession</b> informácie)"
+
+#: ../data/gui/esession_info_window.ui.h:2
+msgid "_Verify"
+msgstr "O_veriť"
+
+#: ../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"
+
+#: ../data/gui/filetransfers.ui.h:2
+#, fuzzy
+msgid "Cancel file transfer"
+msgstr "Zrušiť prenos vybraných súborov"
+
+#: ../data/gui/filetransfers.ui.h:3
+msgid "Cancels the selected file transfer"
+msgstr "Zrušiť prenos vybraných 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"
+
+#: ../data/gui/filetransfers.ui.h:5
+msgid "Clean _up"
+msgstr "Vyč_istiť"
+
+#: ../data/gui/filetransfers.ui.h:6
+msgid "File Transfers"
+msgstr "Prenos súborov"
+
+#: ../data/gui/filetransfers.ui.h:7
+msgid "Hides the window"
+msgstr "Skrývanie okien"
+
+#: ../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"
+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:12
+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:13
+msgid "_Notify me when a file transfer is complete"
+msgstr "_Upozorniť ma, keď sa dokončí prenos"
+
+#: ../data/gui/filetransfers.ui.h:14
+msgid "_Pause"
+msgstr "_Pozastaviť"
+
+#: ../data/gui/filetransfers.ui.h:15
+msgid "file transfers list"
+msgstr "zoznam prenosu súborov"
+
+#: ../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:883
+msgid "Bold"
+msgstr "Tučné"
+
+#: ../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"
+
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
+msgid "Font style:"
+msgstr "Štýl fontu:"
+
+#: ../data/gui/gajim_themes_window.ui.h:8
+msgid "Gajim Themes Customization"
+msgstr "Úprava tém programu Gajim"
+
+#: ../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"
+
+#: ../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:12 ../src/chat_control.py:884
+msgid "Italic"
+msgstr "Kurzíva"
+
+#: ../data/gui/gajim_themes_window.ui.h:13
+msgid ""
+"MUC\n"
+"Messages"
+msgstr ""
+"MUC\n"
+"Správy"
+
+#: ../data/gui/gajim_themes_window.ui.h:15
+msgid ""
+"MUC Directed\n"
+"Messages"
+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 "_Minimize on close"
+msgstr "_Minimalizovať pri zavretí"
+
+#: ../data/gui/gc_occupants_menu.ui.h:1
+msgid "Mo_derator"
+msgstr "Mo_derátor"
+
+#: ../data/gui/gc_occupants_menu.ui.h:2
+#, fuzzy
+msgid "Occupant Actions"
+msgstr "Pokročilé akcie"
+
+#: ../data/gui/gc_occupants_menu.ui.h:3
+msgid "_Admin"
+msgstr "_Admin"
+
+#: ../data/gui/gc_occupants_menu.ui.h:4
+msgid "_Ban"
+msgstr "_Zakázať"
+
+#: ../data/gui/gc_occupants_menu.ui.h:5
+msgid "_Kick"
+msgstr "_Vykopnúť"
+
+#: ../data/gui/gc_occupants_menu.ui.h:6
+msgid "_Member"
+msgstr "_Člen"
+
+#: ../data/gui/gc_occupants_menu.ui.h:7
+msgid "_Owner"
+msgstr "_Vlastník"
+
+#: ../data/gui/gc_occupants_menu.ui.h:8
+msgid "_Voice"
+msgstr "_Hlas"
+
+#: ../data/gui/groups_post_window.ui.h:1
+msgid "Create new post"
+msgstr "Vytvoriť novú správu"
+
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
+msgid "From"
+msgstr "Od"
+
+#. holds subject
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
+msgid "Subject"
+msgstr "Predmet"
+
+#: ../data/gui/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."
+
+#: ../data/gui/history_manager.ui.h:3
+msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
+msgstr "<big><b>Vitajte v Gajim správca histórie</b></big>"
+
+#: ../data/gui/history_manager.ui.h:4
+msgid "Export"
+msgstr "Exportovať"
+
+#: ../data/gui/history_manager.ui.h:5
+msgid "Gajim History Logs Manager"
+msgstr "Gajim - správca histórie"
+
+#: ../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."
+msgstr ""
+"Tento správca záznamov nie je určený k prezeraniu záznamov. Ak hľadáte "
+"lepšiu funkčnosť, použite na to určené okno histórie.\n"
+"\n"
+"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:9
+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_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Meno kontaktu"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Diskuné skupiny"
+
+#: ../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 "_Log conversation history"
+msgstr "Zaznamenávať históriu k_onverzácie"
+
+#: ../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:2171
+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:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
+msgid "Nickname:"
+msgstr "Prezývka:"
+
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
+msgid "Password:"
+msgstr "Heslo:"
+
+#: ../data/gui/join_groupchat_window.ui.h:7
+msgid "Recently:"
+msgstr "Posledné:"
+
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
+msgid "Room:"
+msgstr "Miestnosť:"
+
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Zazáložkovať túto miestnosť"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
+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í"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:7
+msgid "Print status:"
+msgstr "Vypísať stav:"
+
+#: ../data/gui/manage_bookmarks_window.ui.h:10
+msgid "Title:"
+msgstr "Titulok:"
+
+#: ../data/gui/manage_pep_services_window.ui.h:1
+msgid "PEP Service Configuration"
+msgstr "Konfigurácia služby PEP"
+
+#: ../data/gui/manage_pep_services_window.ui.h:2
+msgid "_Configure"
+msgstr "_Nastavovať"
+
+#: ../data/gui/manage_proxies_window.ui.h:1
+msgid "<b>Properties</b>"
+msgstr "<b>Predvoľby</b>"
+
+#: ../data/gui/manage_proxies_window.ui.h:2
+msgid "<b>Settings</b>"
+msgstr "<b>Nastavenia</b>"
+
+#: ../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:6
+msgid "Pass_word:"
+msgstr "He_slo:"
+
+#: ../data/gui/manage_proxies_window.ui.h:7
+msgid "Proxy _Host:"
+msgstr "_Hostiteľ proxy:"
+
+#: ../data/gui/manage_proxies_window.ui.h:8
+msgid "Proxy _Port:"
+msgstr "_Port proxy:"
+
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../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:12
+msgid "_BOSH URL:"
+msgstr "_BOSH URL:"
+
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Názov:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
+msgid "_Type:"
+msgstr "_Typ:"
+
+#: ../data/gui/manage_proxies_window.ui.h:15
+msgid "_Username:"
+msgstr "_Používateľské meno:"
+
+#: ../data/gui/passphrase_dialog.ui.h:1
+msgid "Passphrase"
+msgstr "Passfráza"
+
+#: ../data/gui/preferences_window.ui.h:1
+msgid "<b>Advanced Configuration Editor</b>"
+msgstr "<b>Editor rozšírenej konfigurácie</b>"
+
+#: ../data/gui/preferences_window.ui.h:2
+msgid "<b>Applications</b>"
+msgstr "<b>Aplikácie</b>"
+
+#: ../data/gui/preferences_window.ui.h:3
+msgid "<b>Audio</b>"
+msgstr "<b>Zvuk</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
+msgid "<b>Auto Status</b>"
+msgstr "<b>Automatický stav</b>"
+
+#: ../data/gui/preferences_window.ui.h:5
+msgid "<b>Chat Appearance</b>"
+msgstr "<b>Vzhľad rozhovoru</b>"
+
+#: ../data/gui/preferences_window.ui.h:6
+msgid "<b>Chat Line Colors</b>"
+msgstr "<b>Farby riadku rozhovoru</b>"
+
+#: ../data/gui/preferences_window.ui.h:7
+msgid "<b>Chat state notifications</b>"
+msgstr "<b>Oznámenia stavu rozhovoru</b>"
+
+#: ../data/gui/preferences_window.ui.h:8
+msgid "<b>Connection</b>"
+msgstr "<b>Pripojenie</b>"
+
+#. 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>"
+
+#: ../data/gui/preferences_window.ui.h:11
+msgid "<b>Font</b>"
+msgstr "<b>Písmo</b>"
+
+#: ../data/gui/preferences_window.ui.h:12
+msgid "<b>GMail Options</b>"
+msgstr "<b>Nastavenia GMail</b>"
+
+#: ../data/gui/preferences_window.ui.h:14
+msgid "<b>Preset Status Messages</b>"
+msgstr "<b>Vrátiť pôvodnú správu o stave</b>"
+
+#: ../data/gui/preferences_window.ui.h:15
+msgid "<b>Privacy</b>"
+msgstr "<b>Súkromie</b>"
+
+#: ../data/gui/preferences_window.ui.h:16
+msgid "<b>Roster Appearance</b>"
+msgstr "<b>Vzhľad zoznamu</b>"
+
+#: ../data/gui/preferences_window.ui.h:18
+msgid "<b>Status Messages</b>"
+msgstr "<b>Správy o stave</b>"
+
+#: ../data/gui/preferences_window.ui.h:19
+msgid "<b>Themes</b>"
+msgstr "<b>Témy</b>"
+
+#: ../data/gui/preferences_window.ui.h:20
+msgid "<b>Video</b>"
+msgstr "<b>Video</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
+msgid "<b>Visual Notifications</b>"
+msgstr "<b>Vizuálne oznámenie</b>"
+
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr "<i>(príklad: stunserver.org)</i>"
+
+#: ../data/gui/preferences_window.ui.h:23
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#: ../data/gui/preferences_window.ui.h:24
+msgid "Advanced..."
+msgstr "Pokročilé..."
+
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Všetky stavy"
+
+#: ../data/gui/preferences_window.ui.h:26
+msgid "Allow _OS information to be sent"
+msgstr "Povoliť _odosielanie informácie o operačnom systéme"
+
+#: ../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"
+
+#: ../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ý"
+
+#: ../data/gui/preferences_window.ui.h:29
+msgid "Allow sound when I'm _busy"
+msgstr "Povoliť zvuk keď som zane_prázdnený"
+
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Preč"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Vždy použiť štandartné aplikácie OS/X"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Vždy použiť štandartné aplikácie OS/X"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Vždy použiť štandartné aplikácie OS/X"
+
+#: ../data/gui/preferences_window.ui.h:34
+msgid "Ask status message when I:"
+msgstr "Vyžiadať správu o stave, keď som:"
+
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr "Zvuk / Video"
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr "Vstupné zariadenie zvuku"
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr "Výstupné zariadenie zvuku"
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "Prip_ojiť sa pri štarte programu Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
+msgid "Chat message:"
+msgstr "Správa rozhovoru:"
+
+#: ../data/gui/preferences_window.ui.h:40
+msgid "Check on startup if Gajim is the _default Jabber client"
+msgstr "Kontrolovať pri spustení, či je Gajim pre_dvoleným Jabber klientom"
+
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Píše správu"
+
+#: ../data/gui/preferences_window.ui.h:42
+msgid "Configure color and font of the interface"
+msgstr "Nastavovať farbu a písmo rozhrania"
+
+#: ../data/gui/preferences_window.ui.h:43
+msgid "Contact's message:"
+msgstr "Správa kontaktu:"
+
+#: ../data/gui/preferences_window.ui.h:44
+msgid "Contact's nickname:"
+msgstr "Prezývka kontaktu:"
+
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Vlastný"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Zakázané"
+
+#: ../data/gui/preferences_window.ui.h:51
+msgid "Display _activity of contacts in roster"
+msgstr "Zobraziť _aktivitu kontaktov v zozname kontaktov"
+
+#: ../data/gui/preferences_window.ui.h:52
+msgid "Display _extra email details"
+msgstr "Zobraziť ďalši_e podrobnosti o e-maile"
+
+#: ../data/gui/preferences_window.ui.h:53
+msgid "Display _location of contacts in roster"
+msgstr "Zobraziť _pozíciu kontaktov v zozname"
+
+#: ../data/gui/preferences_window.ui.h:54
+msgid "Display _tunes of contacts in roster"
+msgstr "Zobraziť _hudbu kontaktov v zozname kontaktov"
+
+#: ../data/gui/preferences_window.ui.h:55
+msgid "Display a_vatars of contacts in roster"
+msgstr "Zobraziť a_vatary v zozname kontaktov"
+
+#: ../data/gui/preferences_window.ui.h:56
+msgid "Display m_ood of contacts in roster"
+msgstr "Zobraziť _náladu kontaktov v zozname kontaktov"
+
+#: ../data/gui/preferences_window.ui.h:57
+msgid "Display status _messages of contacts in roster"
+msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
+
+#: ../data/gui/preferences_window.ui.h:58
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"display in chat windows."
+msgstr ""
+"Gajim môže odoslať a prijať meta-informácie vzťahujúce sa ku konverzácii s "
+"inou osobou. Tu môžete vybrať stavy, ktoré majú byť zobrazované v diskusnom "
+"okne."
+
+#: ../data/gui/preferences_window.ui.h:59
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact. Here you can specify which chatstates you want to "
+"send to the other party."
+msgstr ""
+"Gajim môže odoslať a prijať meta-informácie vzťahujúce sa ku konverzácii s "
+"vašim kontaktom. Tu môžete vybrať stavy, o ktorých majú byť odosielané "
+"informácie druhej strane."
+
+#: ../data/gui/preferences_window.ui.h:60
+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:62
+msgid "Hide all buttons in chat windows"
+msgstr "Skryje všetky tlačidlá v oknách rozhovorov"
+
+#: ../data/gui/preferences_window.ui.h:63
+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:64
+msgid ""
+"If checked, Gajim will also include information about the sender of the new "
+"emails"
+msgstr ""
+"Ak je zaškrtnuté, Gajim pridá informácie o odosielateľovi do nových e-mailov"
+
+#: ../data/gui/preferences_window.ui.h:65
+msgid ""
+"If checked, Gajim will change status to Away when the computer is unused."
+msgstr ""
+"Ak je zaškrtnuté, Gajim zmení stav na Preč, keď nebude používaný počítač."
+
+#: ../data/gui/preferences_window.ui.h:66
+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č."
+
+#: ../data/gui/preferences_window.ui.h:67
+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:68
+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:69
+msgid ""
+"If checked, Gajim will display the activity of contacts in the roster window"
+msgstr ""
+"Ak je zaškrtnuté, Gajim bude zobrazovať aktivitu kontaktov v okne sozoznamom "
+"kontaktov."
+
+#: ../data/gui/preferences_window.ui.h:70
+#, 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."
+
+#: ../data/gui/preferences_window.ui.h:71
+msgid ""
+"If checked, Gajim will display the mood of contacts in the roster window"
+msgstr ""
+"Ak je zaškrtnuté, Gajim bude zobrazovať náladu kontaktov v okne so zoznamom "
+"kontaktovi."
+
+#: ../data/gui/preferences_window.ui.h:72
+msgid ""
+"If checked, Gajim will display the tunes of contacts in the roster window"
+msgstr ""
+"Ak je zaškrtnuté, Gajim bude zobrazovať hudbu kontaktov v okne so zoznamom "
+"kontaktov"
+
+#: ../data/gui/preferences_window.ui.h:73
+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: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 ""
+"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:75
+msgid ""
+"If checked, Gajim will keep logs for encrypted messages. Please note that "
+"when using E2E encryption the remote party has to agree on logging, else the "
+"messages will not be logged."
+msgstr ""
+
+#: ../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 ""
+"Ak je zaškrtnuté, Gajim zobrazí oznámenie, keď bude prijatý nový e-mail cez "
+"GMail"
+
+#: ../data/gui/preferences_window.ui.h:77
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"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:78
+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:79
+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:80
+msgid "Log _encrypted chat session"
+msgstr "Zaznamenať reláciu šifrova_ného rozhovoru"
+
+#: ../data/gui/preferences_window.ui.h:81
+msgid "Ma_ke message windows compact"
+msgstr "Zmeniť okno správ na _kompaktné"
+
+#: ../data/gui/preferences_window.ui.h:82
+msgid "Ma_nage..."
+msgstr "_Spravovať..."
+
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Server"
+
+#: ../data/gui/preferences_window.ui.h:84
+msgid "Notifications"
+msgstr "Oznámenia"
+
+#: ../data/gui/preferences_window.ui.h:85
+msgid "Notify me about contacts that sign _in"
+msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
+
+#: ../data/gui/preferences_window.ui.h:86
+msgid "Notify me about contacts that sign _out"
+msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
+
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
+
+#: ../data/gui/preferences_window.ui.h:88
+msgid "Notify on new _GMail email"
+msgstr "Upozorniť keď príde na _Gmail e-mail"
+
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nikdy\n"
+"Len ak čakajú udalosti\n"
+"Vždy"
+
+#: ../data/gui/preferences_window.ui.h:90
+msgid "Personal Events"
+msgstr "Osobné udalosti"
+
+#: ../data/gui/preferences_window.ui.h:91
+msgid "Play _sounds"
+msgstr "Prehrať _zvuky"
+
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:93
+msgid "Preferences"
+msgstr "Predvoľby"
+
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+msgid "STUN server:"
+msgstr "STUN server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "_Zobraziť udalosť v zozname"
+
+#: ../data/gui/preferences_window.ui.h:98
+msgid "Show systray:"
+msgstr "Zobraziť oblasť systémových upozornení:"
+
+#: ../data/gui/preferences_window.ui.h:99
+msgid "Sign _in"
+msgstr "Prihlás_il sa"
+
+#: ../data/gui/preferences_window.ui.h:100
+msgid "Sign _out"
+msgstr "_Odhlásil sa"
+
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
+msgid ""
+"Some messages may include rich content (formatting, colors etc). If checked, "
+"Gajim will just display the raw message text."
+msgstr ""
+"Niektoré správy môžu obsahovať rozširujúce informácie (formátovanie, farby, "
+"atď.). Ak je zaškrtnuté, Gajim bude zobrazovať len jednoduchý text."
+
+#: ../data/gui/preferences_window.ui.h:103
+msgid "Sort contacts by status"
+msgstr "Usporiadať kontakty podľa stavu"
+
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
+msgid "Status"
+msgstr "Stav"
+
+#: ../data/gui/preferences_window.ui.h:105
+msgid "Status _iconset:"
+msgstr "Zostava stavových _ikôn:"
+
+#: ../data/gui/preferences_window.ui.h:106
+msgid "Style"
+msgstr "Štýl"
+
+#: ../data/gui/preferences_window.ui.h:107
+msgid "T_heme:"
+msgstr "_Téma:"
+
+#: ../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"
+msgstr ""
+"Automatická správa pre stav preč. Ak je prázdna, Gajim nebude meniť súčasnú "
+"stavovú správu o stave"
+
+#: ../data/gui/preferences_window.ui.h:111
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:114
+msgid "Use _transports icons"
+msgstr "Použiť ikony _transportov"
+
+#: ../data/gui/preferences_window.ui.h:115
+msgid "Use system _default"
+msgstr "Použiť systémové _nastavenia"
+
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr "Vstupné zariadenie videa"
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr "Výstupné zariadenie videa"
+
+#: ../data/gui/preferences_window.ui.h:118
+msgid "When new event is received:"
+msgstr "Keď nastane nová udalosť:"
+
+#: ../data/gui/preferences_window.ui.h:119
+msgid "Your message:"
+msgstr "Vaša správa:"
+
+#: ../data/gui/preferences_window.ui.h:120
+msgid "Your nickname:"
+msgstr "Vaša prezývka:"
+
+#: ../data/gui/preferences_window.ui.h:121
+msgid "_Away after:"
+msgstr "_Preč po:"
+
+#: ../data/gui/preferences_window.ui.h:122
+msgid "_Browser:"
+msgstr "_Prehliadač:"
+
+#: ../data/gui/preferences_window.ui.h:123
+msgid "_Display chat state notifications:"
+msgstr "Zo_braziť oznámenia o stave rozhovoru:"
+
+#: ../data/gui/preferences_window.ui.h:124
+msgid "_Emoticons:"
+msgstr "_Emotikony:"
+
+#: ../data/gui/preferences_window.ui.h:125
+msgid "_File manager:"
+msgstr "_Správca súborov:"
+
+#: ../data/gui/preferences_window.ui.h:126
+msgid "_Highlight misspelled words"
+msgstr "_Zvýrazniť zle napísané slová"
+
+#: ../data/gui/preferences_window.ui.h:127
+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:128
+msgid "_Ignore rich content in incoming messages"
+msgstr "_Ignorovať rozšírený obsah prichádzajúcich správ"
+
+#: ../data/gui/preferences_window.ui.h:129
+msgid "_Log status changes of contacts"
+msgstr "_Zaznamenať zmenu stavu kontaktu"
+
+#: ../data/gui/preferences_window.ui.h:130
+msgid "_Mail client:"
+msgstr "_E-mailový klient:"
+
+#: ../data/gui/preferences_window.ui.h:131
+msgid "_Not available after:"
+msgstr "_Neprítomný po:"
+
+#: ../data/gui/preferences_window.ui.h:132
+msgid "_Open..."
+msgstr "_Otvoriť..."
+
+#: ../data/gui/preferences_window.ui.h:133
+msgid "_Reset to Default Colors"
+msgstr "Náv_rat k pôvodnému nastaveniu farieb"
+
+#: ../data/gui/preferences_window.ui.h:134
+msgid "_Send chat state notifications:"
+msgstr "Odo_slať oznámenia o stave rozhovoru:"
+
+#: ../data/gui/preferences_window.ui.h:135
+msgid "_Status message:"
+msgstr "_Správa o stave:"
+
+#: ../data/gui/preferences_window.ui.h:136
+msgid "_URL highlight:"
+msgstr "Zvýrazňovanie _URL:"
+
+#: ../data/gui/preferences_window.ui.h:137
+msgid "_Window behavior:"
+msgstr "_Správanie okna:"
+
+#: ../data/gui/preferences_window.ui.h:138
+msgid "in _group chats"
+msgstr "v _diskusných skupiných"
+
+#: ../data/gui/preferences_window.ui.h:139
+#, fuzzy
+msgid "in _roster"
+msgstr "Nie je v zozname"
+
+#: ../data/gui/preferences_window.ui.h:140
+msgid "minutes"
+msgstr "minút"
+
+#: ../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: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
+msgid "Active for this session"
+msgstr "Aktívne pre toto sedenie"
+
+#: ../data/gui/privacy_list_window.ui.h:5
+msgid "Active on each startup"
+msgstr "Aktivovať pri každom spustení"
+
+#: ../data/gui/privacy_list_window.ui.h:6
+msgid "All"
+msgstr "Všetko"
+
+#: ../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
+msgid "Deny"
+msgstr "Zakázať"
+
+#: ../data/gui/privacy_list_window.ui.h:10
+msgid "JabberID"
+msgstr "JabberID"
+
+#: ../data/gui/privacy_list_window.ui.h:11
+msgid "Order:"
+msgstr "Poradie:"
+
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
+msgid "Privacy List"
+msgstr "Súkromný zoznam"
+
+#: ../data/gui/privacy_list_window.ui.h:13
+msgid "all by subscription"
+msgstr "všetko podľa podpisu"
+
+#: ../data/gui/privacy_list_window.ui.h:14
+msgid "all in the group"
+msgstr "všetko v skupine"
+
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Oba"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Od"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "jeden"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "dva"
+
+#: ../data/gui/privacy_list_window.ui.h:19
+msgid "to send me messages"
+msgstr "poslať mi správu"
+
+#: ../data/gui/privacy_list_window.ui.h:20
+msgid "to send me queries"
+msgstr "poslať mi požiadavky"
+
+#: ../data/gui/privacy_list_window.ui.h:21
+msgid "to send me status"
+msgstr "poslať mi stav"
+
+#: ../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>"
+
+#: ../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/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/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/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
+msgid "<b>Extra Address:</b>"
+msgstr "<b>Ďaľšia adresa:</b>"
+
+#. Family 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/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
+msgid "<b>Full Name</b>"
+msgstr "<b>Celé meno</b>"
+
+#. Given Name
+#: ../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/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
+msgid "<b>Homepage:</b>"
+msgstr "<b>Domovská stránka:</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/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
+msgid "<b>Name:</b>"
+msgstr "<b>Meno:</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/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/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
+msgid "<b>Position:</b>"
+msgstr "<b>Pozícia:</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>"
+
+#. 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/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
+msgid "<b>Role:</b>"
+msgstr "<b>Úloha:</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/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
+msgid "<b>Street:</b>"
+msgstr "<b>Ulica:</b>"
+
+#. 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>"
+
+#. "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/profile_window.ui.h:32
+msgid "Click to set your avatar"
+msgstr "Kliknite pre výber avataru"
+
+#: ../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"
+
+#: ../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
+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>"
+
+#: ../data/gui/remove_account_window.ui.h:2
+#, fuzzy
+msgid "Remove account _only from Gajim"
+msgstr "Odstrániť iba z programu Gajim"
+
+#: ../data/gui/remove_account_window.ui.h:3
+msgid "Remove account from Gajim and from _server"
+msgstr "Odstrániť účet z Gajim aj zo _serveru"
+
+#. 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
+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."
+msgstr ""
+
+#: ../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 "Frequently Asked Questions (online)"
+msgstr "Často kladené otázky (online)"
+
+#: ../data/gui/roster_window.ui.h:3
+msgid "Help online"
+msgstr "Pomocník online"
+
+#: ../data/gui/roster_window.ui.h:4
+msgid "Show Only _Active Contacts"
+msgstr "Zobraziť len _aktívne kontakty"
+
+#: ../data/gui/roster_window.ui.h:5
+msgid "Show Trans_ports"
+msgstr "Zobraziť trans_porty"
+
+#: ../data/gui/roster_window.ui.h:6
+msgid "Show _Offline Contacts"
+msgstr "Zobraziť _odhlásené kontakty"
+
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
+msgid "Show _Roster"
+msgstr "Zobraziť _zoznam"
+
+#. 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 "_Akcie"
+
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
+msgid "_Edit"
+msgstr "_Upraviť"
+
+#: ../data/gui/roster_window.ui.h:11
+msgid "_Help"
+msgstr "_Pomocník"
+
+#: ../data/gui/roster_window.ui.h:12
+msgid "_View"
+msgstr "_Zobraziť"
+
+#: ../data/gui/search_window.ui.h:1
+#, 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:5631
+msgid "_Information"
+msgstr "_Informácie"
+
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
+msgid "_Search"
+msgstr "_Hľadať"
+
+#: ../data/gui/service_discovery_window.ui.h:1
+msgid "G_o"
+msgstr "Ch_oď"
+
+#: ../data/gui/service_discovery_window.ui.h:2
+msgid "_Address:"
+msgstr "_Adresa:"
+
+#: ../data/gui/service_registration_window.ui.h:1
+msgid "Register to"
+msgstr "Registrovaný na"
+
+#: ../data/gui/service_registration_window.ui.h:2
+msgid "_Cancel"
+msgstr "_Zrušiť"
+
+#: ../data/gui/single_message_window.ui.h:2
+msgid "From:"
+msgstr "Od:"
+
+#: ../data/gui/single_message_window.ui.h:3
+msgid "Reply to this message"
+msgstr "Odpoveď na túto správu"
+
+#: ../data/gui/single_message_window.ui.h:4
+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 "Subject:"
+msgstr "Predmet:"
+
+#: ../data/gui/single_message_window.ui.h:8
+msgid "To:"
+msgstr "Pre:"
+
+#: ../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/subscription_request_window.ui.h:1
+msgid "Au_thorize"
+msgstr "Au_torizovať"
+
+#: ../data/gui/subscription_request_window.ui.h:2
+msgid "Authorize contact so he or she can know when you're connected"
+msgstr ""
+
+#: ../data/gui/subscription_request_window.ui.h:3
+msgid ""
+"Deny authorization from contact so he or she cannot know when you're "
+"connected"
+msgstr ""
+
+#: ../data/gui/subscription_request_window.ui.h:4
+msgid "Subscription Request"
+msgstr "Požiadavka o zapísanie"
+
+#: ../data/gui/subscription_request_window.ui.h:7
+msgid "_Deny"
+msgstr "_Zakázať"
+
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
+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 "Show All Pending _Events"
+msgstr "Zobraziť všetky čakajúce _udalosti"
+
+#. Given Name
+#: ../data/gui/vcard_information_window.ui.h:3
+msgid "<b>Ask:</b>"
+msgstr "<b>Požiadavka:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:6
+msgid "<b>Client:</b>"
+msgstr "<b>Klient:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:8
+#, fuzzy
+msgid "<b>Contact time:</b>"
+msgstr "<b>Štát:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:19
+msgid "<b>Jabber ID:</b>"
+msgstr "<b>Jabber ID:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:29
+msgid "<b>Resource:</b>"
+msgstr "<b>Zdroj:</b>"
+
+#: ../data/gui/vcard_information_window.ui.h:32
+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:38
+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:42
+msgid "Configured avatar:"
+msgstr "Nastavovaný avatar:"
+
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
+msgid "Contact"
+msgstr "Kontakt"
+
+#: ../data/gui/vcard_information_window.ui.h:44
+msgid "Contact Information"
+msgstr "Kontaktné informácie"
+
+#: ../data/gui/vcard_information_window.ui.h:46
+msgid "More"
+msgstr "Viac"
+
+#: ../data/gui/vcard_information_window.ui.h:48
+msgid "User avatar:"
+msgstr "Používa avatar:"
+
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Písmo</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
+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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
+msgid "Info/Query"
+msgstr "Info/Požiadavka"
+
+#. 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"
+
+#: ../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/zeroconf_information_window.ui.h:6
+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
+msgid "Resource:"
+msgstr "Zdroj:"
+
+#: ../data/gui/zeroconf_information_window.ui.h:9
+msgid "Status:"
+msgstr "Stav:"
+
 #: ../data/gajim.desktop.in.in.h:1
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber klient"
@@ -72,7 +2760,7 @@ msgstr "Celočíselný"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:902
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Farba"
 
@@ -105,10 +2793,6 @@ msgstr[0] "Dostali ste novú položku:"
 msgstr[1] "Dostali ste novú položku:"
 msgstr[2] "Dostali ste novú položku:"
 
-#: ../src/atom_window.py:124
-msgid "You have received new entry:"
-msgstr "Dostali ste novú položku:"
-
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
@@ -214,61 +2898,53 @@ msgstr "Švédčina"
 msgid "Chinese (Ch)"
 msgstr "Čínština (Ch)"
 
-#: ../src/chat_control.py:447
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Jazyk používaný pri kontrole pravopisu"
 
 #. we are not connected
-#: ../src/chat_control.py:479 ../src/chat_control.py:690
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/chat_control.py:480 ../src/chat_control.py:691
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:882
-msgid "Bold"
-msgstr "Tučné"
-
-#: ../src/chat_control.py:883
-msgid "Italic"
-msgstr "Kurzíva"
-
-#: ../src/chat_control.py:884
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Podčiarknuté"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Preškrtnuté"
 
-#: ../src/chat_control.py:908
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Písmo"
 
-#: ../src/chat_control.py:917
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Vymazať formátovanie"
 
-#: ../src/chat_control.py:995
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Skutočne poslať súbor?"
 
-#: ../src/chat_control.py:996
+#: ../src/chat_control.py:997
 #, 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:1449 ../src/chat_control.py:1943
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "Povolené GPG šifrovanie"
 
 #. Add to roster
-#: ../src/chat_control.py:1474 ../src/common/contacts.py:158
-#: ../src/common/contacts.py:277 ../src/common/helpers.py:56
-#: ../src/common/helpers.py:244 ../src/dialogs.py:1064 ../src/dialogs.py:2069
-#: ../src/dialogs.py:2098 ../src/gui_interface.py:664
+#: ../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
@@ -276,102 +2952,102 @@ msgstr "Povolené GPG šifrovanie"
 msgid "Not in Roster"
 msgstr "Nie je v zozname"
 
-#: ../src/chat_control.py:1518
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Tento kontakt nepodporuje prenos súborov."
 
-#: ../src/chat_control.py:1521
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1610
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1808
+#: ../src/chat_control.py:1812
 #, 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:1923 ../src/dialogs.py:4814
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Nie je priradený GPG kľúč"
 
-#: ../src/chat_control.py:1924
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1933
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "Zakázané GPG šifrovanie"
 
-#: ../src/chat_control.py:1959
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Relácia BUDE zaznamenaná"
 
-#: ../src/chat_control.py:1961
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Relácia NEBUDE zaznamenaná"
 
 #. encryption %s active
-#: ../src/chat_control.py:1978
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1978
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "NIE je"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1980
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "bude"
 
-#: ../src/chat_control.py:1980
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "NEbude"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1984
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "a overený"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1988
+#: ../src/chat_control.py:1992
 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:1995
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2135
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2144
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Táto relácia je šifrovaná"
 
-#: ../src/chat_control.py:2147
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " a BUDE zaznamenaná"
 
-#: ../src/chat_control.py:2149
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " a NEBUDE zaznamenaná"
 
-#: ../src/chat_control.py:2154
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -379,40 +3055,40 @@ msgstr ""
 "Identita vzdialeného kontaktu nie je overená. Pre viac podrobností kliknite "
 "na tlačidlo v tvare štítu."
 
-#: ../src/chat_control.py:2156
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E šifrovanie zakázané"
 
-#: ../src/chat_control.py:2193 ../src/chat_control.py:2206
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Nasledujúca správa NEbola šifrovaná"
 
-#: ../src/chat_control.py:2199
+#: ../src/chat_control.py:2203
 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:2471
+#: ../src/chat_control.py:2475
 #, 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:2472
+#: ../src/chat_control.py:2476
 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:2615 ../src/common/connection_handlers.py:1571
-#: ../src/common/connection_handlers.py:1622
-#: ../src/common/connection_handlers.py:1816
-#: ../src/common/connection_handlers.py:1966 ../src/common/connection.py:435
+#: ../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
 msgid "Database Error"
 msgstr "Chyba databázy"
 
-#: ../src/chat_control.py:2616
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -421,7 +3097,7 @@ msgstr ""
 "Súbor databázy (%s) nemôže byť prečítaný. Skúste ho opraviť alebo ho "
 "odstrániť (všetko v histórii bude stratené)."
 
-#: ../src/chat_control.py:2854
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je teraz %(status)s"
@@ -481,10 +3157,6 @@ msgstr "Mám čas na debatu"
 msgid "Online"
 msgstr "Prítomný"
 
-#: ../src/common/commands.py:106 ../src/common/helpers.py:232
-msgid "Away"
-msgstr "Preč"
-
 #: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr ""
@@ -524,7 +3196,7 @@ 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:56 ../src/roster_window.py:817
+#: ../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
 msgid "Groupchats"
@@ -631,7 +3303,7 @@ 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:3358
+#: ../src/common/optparser.py:517 ../src/gui_interface.py:3370
 msgid "default"
 msgstr "predvolená"
 
@@ -1465,37 +4137,37 @@ msgstr ""
 "s"
 
 #: ../src/common/connection_handlers.py:438
-#: ../src/common/connection_handlers.py:1569
-#: ../src/common/connection_handlers.py:1620
-#: ../src/common/connection_handlers.py:1814
-#: ../src/common/connection_handlers.py:1964 ../src/common/connection.py:433
+#: ../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
 msgid "Disk Write Error"
 msgstr "Chyba pri zápise na disk"
 
-#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1440
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Neviditeľnosť nie je podporovaná"
 
-#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1441
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Účet %s nepodporuje neviditeľnosť."
 
-#: ../src/common/connection_handlers.py:1390 ../src/common/connection.py:248
-#: ../src/config.py:2042 ../src/config.py:2051 ../src/config.py:2110
-#: ../src/config.py:3489 ../src/dataforms_widget.py:577 ../src/dialogs.py:2922
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Nesprávné Jabber ID"
 
-#: ../src/common/connection_handlers.py:1391
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1572
-#: ../src/common/connection_handlers.py:1623
-#: ../src/common/connection_handlers.py:1817
-#: ../src/common/connection_handlers.py:1967 ../src/common/connection.py:436
+#: ../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 ""
@@ -1506,7 +4178,7 @@ msgstr ""
 "trac.gajim.org/wiki/DatabaseBackup) alebo ho odstrániť (všetko v histórii "
 "bude stratené)."
 
-#: ../src/common/connection_handlers.py:1669
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Prezývka nie je povolená: %s"
@@ -1514,76 +4186,76 @@ msgstr "Prezývka nie je povolená: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:1764
-#: ../src/common/connection_handlers.py:1772
-#: ../src/common/connection_handlers.py:1778
-#: ../src/common/connection_handlers.py:1781
-#: ../src/common/connection_handlers.py:1784
-#: ../src/common/connection_handlers.py:1788 ../src/gui_interface.py:129
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Nie je možné pripojiť sa do diskusnej skupiny"
 
-#: ../src/common/connection_handlers.py:1765
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1773
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Dostali ste ban z diskusnej skupiny %s."
 
-#: ../src/common/connection_handlers.py:1779
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Diskusná skupina %s neexistuje."
 
-#: ../src/common/connection_handlers.py:1782
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Vytváranie diskusných skupín je obmedzené."
 
-#: ../src/common/connection_handlers.py:1785
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Vaša zaregistrovaná prezývka musí byť použitá v diskusnej skupine %s."
 
-#: ../src/common/connection_handlers.py:1789
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Nie ste v zozname členov v skupinovej diskusii %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:1832
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Miestnosť bola zničená"
 
-#: ../src/common/connection_handlers.py:1840
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Môžete sa prihlásiť do tejto miestnosti namiesto: %s"
 
-#: ../src/common/connection_handlers.py:1876
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Chcem si vás pridať do môjho zoznamu."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:1897
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sme prihlásení k %s"
 
-#: ../src/common/connection_handlers.py:1899
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: ../src/common/connection_handlers.py:1901
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sme odhlásení od %s"
 
-#: ../src/common/connection_handlers.py:2096
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -1750,78 +4422,78 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:774
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:775
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Znovu pripojiť manuálne."
 
-#: ../src/common/connection.py:787
+#: ../src/common/connection.py:802
 #, 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:821
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s poskytol rozdielny registračný formulár"
 
-#: ../src/common/connection.py:834
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Neznáma chyba SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:849
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Nesprávna odpoveď"
 
-#: ../src/common/connection.py:850
+#: ../src/common/connection.py:865
 #, 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:1131 ../src/common/connection.py:1260
-#: ../src/common/connection.py:1751
-#: ../src/common/zeroconf/connection_zeroconf.py:191
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
+#: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:1132 ../src/gui_interface.py:745
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr."
 
-#: ../src/common/connection.py:1137
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server odpovedal: %s"
 
-#: ../src/common/connection.py:1150
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Pripojenie k proxy zlyhalo"
 
-#: ../src/common/connection.py:1181 ../src/common/connection.py:1240
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Nie je možné pripojiť sa k účtu %s"
 
-#: ../src/common/connection.py:1182 ../src/common/connection.py:1241
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1207
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1210
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -1830,7 +4502,7 @@ msgstr ""
 "\n"
 "Chyba SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1212
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -1839,24 +4511,24 @@ msgstr ""
 "\n"
 "Neznáma chyba SSL: %d"
 
-#: ../src/common/connection.py:1261
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo to skúste neskôr"
 
-#: ../src/common/connection.py:1292
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Overenie zlyhalo s \"%s\""
 
-#: ../src/common/connection.py:1294
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Prosím, skontrolujte správnosť prihlasovacieho mena a hesla."
 
-#: ../src/common/connection.py:1363
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Chyba počas odstraňovania súkromného zoznamu"
 
-#: ../src/common/connection.py:1364
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -1865,52 +4537,44 @@ 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:1617
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslať kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1620
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Poslať kontakty:"
 
-#: ../src/common/connection.py:1785 ../src/common/connection.py:1808
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 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:2223
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Odstránenie účtu zlyhalo"
 
-#: ../src/common/connection.py:2224
+#: ../src/common/connection.py:2220
 #, 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:56
-#: ../src/gui_interface.py:664
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Pozorovatelia"
 
 #: ../src/common/contacts.py:139 ../src/common/contacts.py:366
-#: ../src/common/helpers.py:56 ../src/disco.py:120 ../src/disco.py:121
-#: ../src/disco.py:1501 ../src/gui_interface.py:414
+#: ../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
 msgid "Transports"
 msgstr "Transporty"
 
-#. FIXME: Ugly workaround.
-#. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
-#. General group cannot be changed
-#: ../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 "Všeobecné"
-
 #: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Nie je v zozname"
@@ -2134,218 +4798,206 @@ msgstr "Koniec týždňa"
 msgid "Weekend!"
 msgstr "Víkend!"
 
-#: ../src/common/helpers.py:150
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Nepovolený znak v názve účtu."
 
-#: ../src/common/helpers.py:155
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Adresa serveru je požadovaná."
 
-#: ../src/common/helpers.py:161
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Nepovolený znak v názve hostiteľa."
 
-#: ../src/common/helpers.py:168
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Nepovolený znak v zdroji."
 
-#: ../src/common/helpers.py:208
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Zaneprázdnený"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Zaneprázdnený"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Neprítomný"
 
-#: ../src/common/helpers.py:215
-msgid "Not Available"
-msgstr "Neprítomný"
-
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Mám čas na debatu"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Mám čas na debatu"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Prítomný"
 
-#: ../src/common/helpers.py:225 ../src/features_window.py:114
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Prítomný"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Pripájanie"
 
-#: ../src/common/helpers.py:230
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "P_reč"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Odhlásený"
 
-#: ../src/common/helpers.py:237
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Odhlásený"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Neviditeľný"
 
-#: ../src/common/helpers.py:242
-msgid "Invisible"
-msgstr "Neviditeľný"
-
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
 
-#: ../src/common/helpers.py:248
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?kontakt má stav:Chyba"
 
-#: ../src/common/helpers.py:253
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Zápis už máme:Žiadny"
 
-#: ../src/common/helpers.py:255
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Pre"
 
-#: ../src/common/helpers.py:257
-msgid "From"
-msgstr "Od"
-
-#: ../src/common/helpers.py:259
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Oba"
 
-#: ../src/common/helpers.py:267
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Vyžiadať (zápis): Žiadny"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Zapísať"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Rola kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:281
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderátori"
 
-#: ../src/common/helpers.py:283
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderátor"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Účastníci"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Účastník"
 
-#: ../src/common/helpers.py:291
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Návštevníci"
 
-#: ../src/common/helpers.py:293
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Návštevník"
 
-#: ../src/common/helpers.py:299
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Príslušnosť kontaktu v diskusnej skupine: žiadna"
 
-#: ../src/common/helpers.py:301
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Vlastník"
 
-#: ../src/common/helpers.py:303
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrátor"
 
-#: ../src/common/helpers.py:305
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Člen"
 
-#: ../src/common/helpers.py:344
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "sleduje konverzáciu"
 
-#: ../src/common/helpers.py:346
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "robí niečo iné"
 
-#: ../src/common/helpers.py:348
+#: ../src/common/helpers.py:349
 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:351
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "prestal písať správu"
 
-#: ../src/common/helpers.py:353
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "zatvoril okno alebo záložku"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:618
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:621
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:625
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:628
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:632
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:635
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:638
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1107 ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -2353,22 +5005,22 @@ msgstr[0] "%d správ čaká"
 msgstr[1] "%d správa čaká"
 msgstr[2] "%d správy čakajú"
 
-#: ../src/common/helpers.py:1120
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " z miestnosti %s"
 
-#: ../src/common/helpers.py:1123 ../src/common/helpers.py:1142
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " od používateľa %s"
 
-#: ../src/common/helpers.py:1125
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1132 ../src/common/helpers.py:1139
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -2376,32 +5028,21 @@ msgstr[0] "%d udalostí čaká"
 msgstr[1] "%d udalosť čaká"
 msgstr[2] "%d udalosti čakajú"
 
-#. No configured account
-#: ../src/common/helpers.py:1158 ../src/common/helpers.py:1170
-#: ../src/notify.py:553 ../src/notify.py:574 ../src/notify.py:612
-#: ../src/notify.py:624
-msgid "Gajim"
-msgstr "Gajim"
-
-#: ../src/common/helpers.py:1172
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/helpers.py:1338
-msgid "I would like to add you to my contact list."
-msgstr "Chcem si vás pridať do môjho zoznamu kontaktov."
-
-#: ../src/common/helpers.py:1340
+#: ../src/common/helpers.py:1341
 msgid "Hello, I am $name."
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:102
+#: ../src/common/jingle_rtp.py:106
 #, python-format
 msgid "%s configuration error"
 msgstr "%s konfiguračná chyba"
 
-#: ../src/common/jingle_rtp.py:103
+#: ../src/common/jingle_rtp.py:107
 #, python-format
 msgid ""
 "Couldn't setup %s. Check your configuration.\n"
@@ -2413,19 +5054,19 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/common/jingle_rtp.py:295
+#: ../src/common/jingle_rtp.py:299
 msgid "audio input"
 msgstr "zvukový vstup"
 
-#: ../src/common/jingle_rtp.py:298
+#: ../src/common/jingle_rtp.py:302
 msgid "audio output"
 msgstr "zvukový výstup"
 
-#: ../src/common/jingle_rtp.py:327
+#: ../src/common/jingle_rtp.py:331
 msgid "video input"
 msgstr "video vstup"
 
-#: ../src/common/jingle_rtp.py:335
+#: ../src/common/jingle_rtp.py:339
 msgid "video output"
 msgstr "video výstup"
 
@@ -2439,59 +5080,59 @@ msgstr "Chyba pri vykonávaní \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr ""
 
-#: ../src/common/multimedia_helpers.py:36
+#: ../src/common/multimedia_helpers.py:37
 msgid " Default device"
 msgstr " Predvolené zariadenie"
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:52
+#: ../src/common/multimedia_helpers.py:53
 msgid "Audio test"
 msgstr "Zvukový test"
 
 #. Auto src
 #. Auto sink
 #. Auto src
-#: ../src/common/multimedia_helpers.py:55
-#: ../src/common/multimedia_helpers.py:68
-#: ../src/common/multimedia_helpers.py:81
-#: ../src/common/multimedia_helpers.py:98
+#: ../src/common/multimedia_helpers.py:56
+#: ../src/common/multimedia_helpers.py:69
+#: ../src/common/multimedia_helpers.py:82
+#: ../src/common/multimedia_helpers.py:99
 msgid "Autodetect"
 msgstr "Automatická detekcia"
 
 #. Alsa src
 #. Alsa sink
-#: ../src/common/multimedia_helpers.py:58
-#: ../src/common/multimedia_helpers.py:70
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
 #, python-format
 msgid "ALSA: %s"
 msgstr "ALSA: %s"
 
 #. Fake sink
 #. Fake video output
-#: ../src/common/multimedia_helpers.py:66
-#: ../src/common/multimedia_helpers.py:93
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
 msgid "Fake audio output"
 msgstr ""
 
 #. Test src
-#: ../src/common/multimedia_helpers.py:78
+#: ../src/common/multimedia_helpers.py:79
 msgid "Video test"
 msgstr "Video test"
 
-#. V4L2 src ; TODO: Figure out why it doesn't work
-#: ../src/common/multimedia_helpers.py:83
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
 #, python-format
 msgid "V4L2: %s"
 msgstr "V4L2: %s"
 
 #. Auto sink
-#: ../src/common/multimedia_helpers.py:95
+#: ../src/common/multimedia_helpers.py:96
 #, python-format
 msgid "X Window System (X11/XShm/Xv): %s"
 msgstr "X Window System (X11/XShm/Xv): %s"
 
 #. ximagesink
-#: ../src/common/multimedia_helpers.py:97
+#: ../src/common/multimedia_helpers.py:98
 msgid "X Window System (without Xv)"
 msgstr "X Window System (bez Xv)"
 
@@ -2994,10 +5635,6 @@ msgstr "Sprchujem sa"
 msgid "Having an Appointment"
 msgstr "Na schôdzke"
 
-#: ../src/common/pep.py:150
-msgid "Inactive"
-msgstr "Neaktívny"
-
 #: ../src/common/pep.py:151
 msgid "Day Off"
 msgstr "Koniec dňa"
@@ -3189,11 +5826,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:180
+#: ../src/common/zeroconf/connection_zeroconf.py:178
 msgid "Avahi error"
 msgstr "Chyba Avahi"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:181
+#: ../src/common/zeroconf/connection_zeroconf.py:179
 #, python-format
 msgid ""
 "%s\n"
@@ -3202,44 +5839,44 @@ msgstr ""
 "%s\n"
 "Link-local správy nemusia správne fungovať."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:192
+#: ../src/common/zeroconf/connection_zeroconf.py:190
 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:201
-#: ../src/common/zeroconf/connection_zeroconf.py:205
+#: ../src/common/zeroconf/connection_zeroconf.py:199
+#: ../src/common/zeroconf/connection_zeroconf.py:203
 msgid "Could not start local service"
 msgstr "Nie je možné spustiť lokálnu službu"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:202
+#: ../src/common/zeroconf/connection_zeroconf.py:200
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Nie je možné použiť port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:206
-#: ../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:204
+#: ../src/common/zeroconf/connection_zeroconf.py:283
+#: ../src/common/zeroconf/connection_zeroconf.py:294
+#: ../src/common/zeroconf/connection_zeroconf.py:308
 msgid "Please check if avahi-daemon is running."
 msgstr "Prosím skontrolujte, či je spustený program avahi-daemon"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:284
-#: ../src/common/zeroconf/connection_zeroconf.py:295
-#: ../src/common/zeroconf/connection_zeroconf.py:309
+#: ../src/common/zeroconf/connection_zeroconf.py:282
+#: ../src/common/zeroconf/connection_zeroconf.py:293
+#: ../src/common/zeroconf/connection_zeroconf.py:307
 #, 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:326
+#: ../src/common/zeroconf/connection_zeroconf.py:324
 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:336
+#: ../src/common/zeroconf/connection_zeroconf.py:334
 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:361
+#: ../src/common/zeroconf/connection_zeroconf.py:359
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
@@ -3252,14 +5889,6 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Chyba pri pridávaní služby. %s"
 
-#: ../src/config.py:170 ../src/config.py:653
-msgid "Disabled"
-msgstr "Zakázané"
-
-#: ../src/config.py:391
-msgid "Status"
-msgstr "Stav"
-
 #: ../src/config.py:397
 msgid "Default Message"
 msgstr "Predvolená správa"
@@ -3291,15 +5920,6 @@ msgstr "titulok správy o stave"
 msgid "status message text"
 msgstr "text správy o stave"
 
-#: ../src/config.py:1256 ../src/config.py:1359 ../src/config.py:1652
-#: ../src/config.py:1657 ../src/config.py:2205 ../src/config.py:2284
-#: ../src/config.py:2297 ../src/config.py:3525 ../src/config.py:3598
-#: ../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 "Žiadny"
-
 #. 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
@@ -3320,19 +5940,7 @@ msgstr ""
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1748 ../src/config.py:2298
-msgid "No key selected"
-msgstr "Žiadny kľúč nie je vybraný"
-
-#: ../src/config.py:1765
-msgid "Server:"
-msgstr "Server:"
-
-#: ../src/config.py:1775 ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../src/config.py:1887 ../src/config.py:1931
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Neprečítané udalosti"
 
@@ -3340,179 +5948,179 @@ msgstr "Neprečítané udalosti"
 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:1914
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Máte otvorený rozhovor pod účtom %s"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1918
 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:1927 ../src/config.py:2451 ../src/config.py:2487
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Ste pripojený na server"
 
-#: ../src/config.py:1928
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu názvu účtu, musíte byť odpojený."
 
-#: ../src/config.py:1932
+#: ../src/config.py:1935
 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:1938
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Názov účtu je už použitý"
 
-#: ../src/config.py:1939
+#: ../src/config.py:1942
 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:1943 ../src/config.py:1947
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Nesprávny názov účtu"
 
-#: ../src/config.py:1944
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Názov účtu nemôže byť prázdny."
 
-#: ../src/config.py:1948
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Názov účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:2023
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Premenovať účet"
 
-#: ../src/config.py:2024
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Zadať nový názov pre účet %s"
 
-#: ../src/config.py:2052
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musí byť v tvare \"používateľ@menoserveru\"."
 
-#: ../src/config.py:2260 ../src/config.py:3535
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:2261 ../src/config.py:3536
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Vlastný port musí byť číslo portu."
 
-#: ../src/config.py:2282
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa získať tajné kľúče"
 
-#: ../src/config.py:2283
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Nie je tu tajný OpenPGP kľúč k dispozícii."
 
-#: ../src/config.py:2317
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Výber OpenPGP kľúča"
 
-#: ../src/config.py:2318
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:2325
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Taký účet nie je k dispozícii"
 
-#: ../src/config.py:2326
+#: ../src/config.py:2329
 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:2333 ../src/dialogs.py:2127 ../src/dialogs.py:2362
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený k serveru"
 
-#: ../src/config.py:2334
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:2338
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Server nepodporuje Vcard"
 
-#: ../src/config.py:2339
+#: ../src/config.py:2342
 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:2452 ../src/config.py:2488
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "Pre zakázanie účtu, musíte byť odpojený."
 
-#: ../src/config.py:2457
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Účet Local už existuje."
 
-#: ../src/config.py:2458
+#: ../src/config.py:2461
 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:2615
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Upraviť %s"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
 #. list at the beginning
-#: ../src/config.py:2653
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Čierna listina"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Zoznam členov"
 
-#: ../src/config.py:2655
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Zoznam vlastníkov"
 
-#: ../src/config.py:2656
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Zoznam správcov"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2705 ../src/disco.py:875 ../src/history_manager.py:201
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2715
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Dôvod"
 
-#: ../src/config.py:2722
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Prezývka"
 
-#: ../src/config.py:2728
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Rola"
 
-#: ../src/config.py:2755
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Zakazujem..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2757
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -3520,11 +6128,11 @@ msgstr ""
 "<b>Koho chcete zakázať?</b>\n"
 "\n"
 
-#: ../src/config.py:2759
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Pridáva sa člen..."
 
-#: ../src/config.py:2760
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -3532,11 +6140,11 @@ msgstr ""
 "<b>Koho chcete pridať k členom?</b>\n"
 "\n"
 
-#: ../src/config.py:2762
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Pridáva sa vlastník..."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -3544,17 +6152,17 @@ msgstr ""
 "<b>Koho chcete určiť za vlastníka?</b>\n"
 "\n"
 
-#: ../src/config.py:2765
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Pridáva sa Administrátor..."
 
-#: ../src/config.py:2766
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
 msgstr ""
 
-#: ../src/config.py:2767
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -3570,76 +6178,85 @@ 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:2868
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuje sa účet %s"
 
-#: ../src/config.py:2890 ../src/gui_interface.py:1121
-#: ../src/gui_interface.py:1218
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Emotikony zakázané"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2891 ../src/gui_interface.py:1198
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2892 ../src/gui_interface.py:1218
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2901
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2902
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2916
+#: ../src/config.py:2927
 #, python-format
 msgid "Connection to server %s failed"
 msgstr "Pripojenie k serveru %s zlyhalo"
 
-#: ../src/config.py:2917
+#: ../src/config.py:2928
 msgid "What would you like to do?"
 msgstr "Čo si prajete vykonať?"
 
-#: ../src/config.py:2918
+#: ../src/config.py:2929
 msgid "Remove only from Gajim"
 msgstr "Odstrániť iba z programu Gajim"
 
-#: ../src/config.py:2919
+#: ../src/config.py:2930
 msgid "Don't remove anything. I'll try again later"
 msgstr ""
 
-#: ../src/config.py:3010
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Predvolené"
 
-#: ../src/config.py:3010
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?zobrazovaný stav:All"
 
-#: ../src/config.py:3011
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Len vstúpiť a vystúpiť"
 
-#: ../src/config.py:3012
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?zobrazovaný stav:None"
 
-#: ../src/config.py:3082
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Nová diskusná skupina"
 
-#: ../src/config.py:3115
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:3116
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -3647,27 +6264,27 @@ msgstr ""
 "odstráňte túto záložku."
 
 #. invalid char
-#: ../src/config.py:3234 ../src/dialogs.py:1925
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Neplatná prezývka"
 
-#: ../src/config.py:3235 ../src/config.py:3249 ../src/config.py:3263
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Znak nie je povolený"
 
-#: ../src/config.py:3248 ../src/config.py:3511
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Neplatný server"
 
-#: ../src/config.py:3262
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Neplatná miestnosť"
 
-#: ../src/config.py:3428
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:3429 ../src/config.py:3435
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -3677,32 +6294,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:3434
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol úspešne vytvorený"
 
-#: ../src/config.py:3472
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:3474
+#: ../src/config.py:3487
 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:3512
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Poskytnite, prosím, server na ktorom sa chcete zaregistrovať."
 
-#: ../src/config.py:3568 ../src/gui_interface.py:1878
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Certifikát už v súbore"
 
-#: ../src/config.py:3569 ../src/gui_interface.py:1879
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3642
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -3717,7 +6334,7 @@ msgstr ""
 "SSL chyba: %(error)s\n"
 "Chcete sa ešte pripojiť k tomuto serveru?"
 
-#: ../src/config.py:3648 ../src/gui_interface.py:1906
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -3728,59 +6345,59 @@ msgstr ""
 "SHA1 fingerprint certifikátu:\n"
 "%s"
 
-#: ../src/config.py:3678 ../src/config.py:3711
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Vyskytla sa chyba počas tvorby účtu"
 
-#: ../src/config.py:3778
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Názov účtu je už používaný"
 
-#: ../src/config.py:3779
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto názvom."
 
-#: ../src/config.py:3932
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:3940
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:3975
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Prvá prijatá správa"
 
-#: ../src/config.py:3976
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Ďalšia prijatá správa zameraná"
 
-#: ../src/config.py:3978
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Ďalšia prijatá správa nezameraná"
 
-#: ../src/config.py:3979
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt pripojený"
 
-#: ../src/config.py:3980
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt odpojený"
 
-#: ../src/config.py:3981
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Správa odoslaná"
 
-#: ../src/config.py:3982
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Zvýraznenie správ v diskusnej skupine"
 
-#: ../src/config.py:3983
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Prijatá správa - diskusná skupina"
 
-#: ../src/config.py:3984
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Prijatý GMail e-mail"
 
@@ -4037,7 +6654,7 @@ msgstr "Požiadavka na zápis pre účet %(account)s od %(jid)s"
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:2122 ../src/gui_interface.py:2661
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Už ste v diskusnej skupine %s"
@@ -4051,10 +6668,6 @@ msgstr "Nemôžete sa pripojiť do diskusnej skupiny, pokiaľ nie ste prihlásen
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť sa k diskusnej skupine s účtom %s"
 
-#: ../src/dialogs.py:2171
-msgid "Join Group Chat"
-msgstr "Pripojiť sa k diskusnej skupine"
-
 #: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Neplatný účet"
@@ -4168,60 +6781,60 @@ 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:2610 ../src/notify.py:263 ../src/notify.py:499
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakt sa prihlasil"
 
-#: ../src/dialogs.py:2612 ../src/notify.py:271 ../src/notify.py:501
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:2614 ../src/notify.py:292 ../src/notify.py:344
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nová správa"
 
 #. single message
-#: ../src/dialogs.py:2614 ../src/notify.py:275 ../src/notify.py:345
-#: ../src/notify.py:503
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nová krátka správa"
 
 #. private message
-#: ../src/dialogs.py:2615 ../src/notify.py:281 ../src/notify.py:345
-#: ../src/notify.py:504
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nová súkromná správa"
 
-#: ../src/dialogs.py:2615 ../src/gui_interface.py:1334 ../src/notify.py:513
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Nový e-mail"
 
-#: ../src/dialogs.py:2617 ../src/gui_interface.py:1396 ../src/notify.py:506
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
-#: ../src/dialogs.py:2619 ../src/gui_interface.py:1300
-#: ../src/gui_interface.py:1365 ../src/notify.py:508
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:2621 ../src/gui_interface.py:1442
-#: ../src/gui_interface.py:1465 ../src/gui_interface.py:1482
-#: ../src/notify.py:510
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:2622 ../src/gui_interface.py:1445 ../src/notify.py:511
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:2624 ../src/gui_interface.py:1141 ../src/notify.py:515
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Pozvánka do diskusnej skupiny"
 
-#: ../src/dialogs.py:2626 ../src/notify.py:255 ../src/notify.py:517
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakt zmenil stav"
 
@@ -4347,10 +6960,6 @@ msgstr "Súkromný zoznam <b><i>%s</i></b>"
 msgid "Privacy List for %s"
 msgstr "Súkromný zoznam pre %s"
 
-#: ../src/dialogs.py:3428
-msgid "Privacy List"
-msgstr "Súkromný zoznam"
-
 #: ../src/dialogs.py:3482
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
@@ -4439,11 +7048,6 @@ msgstr "Keď %s sa stane:"
 msgid "Adding Special Notification for %s"
 msgstr "Pridáva sa špeciálne oznámenie pre %s"
 
-#. # means number
-#: ../src/dialogs.py:4132
-msgid "#"
-msgstr "#"
-
 #: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Podmienka"
@@ -4616,18 +7220,6 @@ msgstr "_Vykonať príkaz"
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1343 ../src/disco.py:1787
-msgid "_Join"
-msgstr "_Pripojiť"
-
-#: ../src/disco.py:1355
-msgid "_Search"
-msgstr "_Hľadať"
-
-#: ../src/disco.py:1504
-msgid "_Edit"
-msgstr "_Upraviť"
-
 #: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
@@ -4652,20 +7244,20 @@ msgstr "Id"
 msgid "_Bookmark"
 msgstr "Zálož_ky"
 
-#: ../src/disco.py:1818 ../src/gui_interface.py:3169
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Záložka je už nastavená"
 
-#: ../src/disco.py:1819 ../src/gui_interface.py:3170
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, 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:1828 ../src/gui_interface.py:3184
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Záložka bola úspešne pridaná"
 
-#: ../src/disco.py:1829 ../src/gui_interface.py:3185
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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."
 
@@ -4900,10 +7492,6 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Vyžaduje python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Audio / Video"
-msgstr "Zvuk / Video"
-
 #: ../src/features_window.py:105
 msgid "Ability to start audio and video chat."
 msgstr ""
@@ -4994,10 +7582,6 @@ msgstr "Prenos súboru bol zastavený"
 msgid "Choose File to Send..."
 msgstr "Vyberte súbor na odoslanie..."
 
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Poslať"
-
 #: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Popis:"
@@ -5030,34 +7614,34 @@ msgstr "Popis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:901
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:902
+#: ../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 ""
 "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:906
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Tento súbor už existuje"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:906
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:913
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, 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:914
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemáte oprávnenie vytvoriť súbor v tomto priečinku."
 
@@ -5605,6 +8189,10 @@ msgstr ""
 "Zadajte \"%(basename)s help %(command)s\" pre viac informácií"
 
 #: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Nesprávna uri"
 
@@ -5657,7 +8245,7 @@ msgstr "Pokračovanie rozhovoru"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1069
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
@@ -5701,7 +8289,7 @@ msgstr "%(nick)s bol zakázaný %(who)s: %(reason)s"
 msgid "You are now known as %s"
 msgstr "Teraz ste známy ako %s"
 
-#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:909
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s je známy ako %(new_nick)s"
@@ -5754,8 +8342,8 @@ msgstr "%s odišiel"
 msgid "%s has joined the group chat"
 msgstr "%s sa pripojil do diskusnej skupiny"
 
-#: ../src/groupchat_control.py:1460 ../src/gui_interface.py:936
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 je teraz %(status)s"
@@ -5770,9 +8358,9 @@ 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:1694 ../src/gui_interface.py:1191
-#: ../src/gui_interface.py:1966 ../src/gui_interface.py:2003
-#: ../src/gui_interface.py:2038 ../src/message_window.py:222
+#: ../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"
@@ -5868,33 +8456,33 @@ 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:817
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nie je štandartným Jabber klientom"
 
-#: ../src/gtkgui_helpers.py:818
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Chcete, aby bol Gajim štandartným Jabber klientom?"
 
-#: ../src/gtkgui_helpers.py:819
+#: ../src/gtkgui_helpers.py:820
 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:886
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Rozšírenie nie je podporované"
 
-#: ../src/gtkgui_helpers.py:887
+#: ../src/gtkgui_helpers.py:888
 #, 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:923
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Uložiť obrázok ako..."
 
-#: ../src/gui_interface.py:130
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -5902,59 +8490,59 @@ msgid ""
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/gui_interface.py:133
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Prijať túto požiadavku?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr ""
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "Overenie HTTP (%(method)s) pre %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:203 ../src/notify.py:519
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Spojenie zlyhalo"
 
-#: ../src/gui_interface.py:596 ../src/gui_interface.py:600
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:611 ../src/gui_interface.py:626
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "chyba pri odosielaní %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:653 ../src/notify.py:521
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Požiadavka o zapísanie"
 
-#: ../src/gui_interface.py:678
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gui_interface.py:679
+#: ../src/gui_interface.py:688
 #, 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:692
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odstránil zo svojho zoznamu"
 
-#: ../src/gui_interface.py:693
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -5962,60 +8550,60 @@ 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:717 ../src/notify.py:523
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Nezapísaný"
 
-#: ../src/gui_interface.py:744
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../src/gui_interface.py:1004
+#: ../src/gui_interface.py:1013
 #, 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:1072
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Miestnosť práve zobrazuje nedostupného člena"
 
-#: ../src/gui_interface.py:1074
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1076
+#: ../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:1080
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Zaznamenávanie miestnosti je teraz povolené"
 
-#: ../src/gui_interface.py:1082
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Zaznamenávanie miestnosti je teraz zakázané"
 
-#: ../src/gui_interface.py:1084
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Miestnosť je teraz neanonymná"
 
-#: ../src/gui_interface.py:1087
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Miestnosť je teraz poloanonymná"
 
-#: ../src/gui_interface.py:1090
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Miestnosť je teraz anonymná"
 
-#: ../src/gui_interface.py:1122
+#: ../src/gui_interface.py:1131
 #, 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:1155
+#: ../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"
@@ -6023,29 +8611,29 @@ msgstr ""
 "Nastavili ste Gajim aby používal GPG agenta, ale tu nie je žiadny spustený "
 "GPG agent alebo vrátil nesprávne heslo.\n"
 
-#: ../src/gui_interface.py:1157 ../src/gui_interface.py:1164
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojený bez vášho OpenPGP kľúča."
 
-#: ../src/gui_interface.py:1159
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gui_interface.py:1163
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Nesprávne OpenGPG heslo"
 
-#: ../src/gui_interface.py:1189
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG kľúč nie je dôveryhodný"
 
-#: ../src/gui_interface.py:1189
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1201
+#: ../src/gui_interface.py:1210
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not                 correctly started "
@@ -6054,12 +8642,12 @@ msgstr ""
 "Správca zväzku kľúčov je nainštalovaný, \t\t\t\tale nesprávne spustený "
 "(pravdepodobne je nesprávne \t\t\t\tnastavená premenná prostredia)"
 
-#: ../src/gui_interface.py:1310
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Nový e-mail %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1312
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -6067,7 +8655,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:1325
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -6082,78 +8670,78 @@ msgstr ""
 "Predmet: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1394
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vám chce poslať súbor."
 
-#: ../src/gui_interface.py:1431 ../src/roster_window.py:1853
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Vzdialený kontakt zastavil prenos"
 
-#: ../src/gui_interface.py:1434 ../src/roster_window.py:1855
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Chyba otvárania súboru"
 
-#: ../src/gui_interface.py:1466
+#: ../src/gui_interface.py:1475
 #, 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:1470
+#: ../src/gui_interface.py:1479
 #, 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:1483
+#: ../src/gui_interface.py:1492
 #, 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:1487
+#: ../src/gui_interface.py:1496
 #, 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:1599
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1606
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Nepodarilo sa dešifrovať správu"
 
-#: ../src/gui_interface.py:1677
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Konflikt používateľských mien"
 
-#: ../src/gui_interface.py:1678
+#: ../src/gui_interface.py:1687
 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:1691
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1704
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1715
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Chyba."
 
-#: ../src/gui_interface.py:1743
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Konflikt zdroju"
 
-#: ../src/gui_interface.py:1744
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -6162,20 +8750,20 @@ msgstr ""
 "zdroj"
 
 #. TODO: we should use another pixmap ;-)
-#: ../src/gui_interface.py:1792
+#: ../src/gui_interface.py:1800
 #, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s chce začať hlasový rozhovor."
 
-#: ../src/gui_interface.py:1795
+#: ../src/gui_interface.py:1803
 msgid "Voice Chat Request"
 msgstr "Požiadavka na hlasový rozhovor"
 
-#: ../src/gui_interface.py:1901
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Chyba overovania SSL certifikátu"
 
-#: ../src/gui_interface.py:1902
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -6183,15 +8771,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1910
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignorovať túto chybu pre tento certifikát."
 
-#: ../src/gui_interface.py:1930
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Chyba SSL certifikátu"
 
-#: ../src/gui_interface.py:1931
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -6208,12 +8796,12 @@ msgstr ""
 "\n"
 "Chcete sa predsa len pripojiť a aktualizovať odtlačok certifikátu?"
 
-#: ../src/gui_interface.py:1961 ../src/gui_interface.py:1998
-#: ../src/gui_interface.py:2034
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Nezabezpečené spojenie"
 
-#: ../src/gui_interface.py:1962
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
 "You are about to connect to the server with an insecure connection. This "
@@ -6223,12 +8811,12 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Mali by ste "
 "tomu predíssť nainštalovaním PyOpenSSL. Ste si istý, že to chcete urobiť?"
 
-#: ../src/gui_interface.py:1965 ../src/gui_interface.py:2002
-#: ../src/gui_interface.py:2037
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Áno, chcem sa naozaj pripojiť nezabezpečene"
 
-#: ../src/gui_interface.py:1999
+#: ../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?"
@@ -6236,7 +8824,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:2035
+#: ../src/gui_interface.py:2043
 #, fuzzy
 msgid ""
 "You are about to send your password unencrypted on an insecure connection. "
@@ -6245,28 +8833,28 @@ msgstr ""
 "Práve sa chystáte poslať vaše heslo cez nezabezpečené spojenie. Ste si istý, "
 "že to chcete urobiť?"
 
-#: ../src/gui_interface.py:2056
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gui_interface.py:2057
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2613 ../src/gui_interface.py:2636
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Emotikony zakázané"
 
-#: ../src/gui_interface.py:2614
+#: ../src/gui_interface.py:2623
 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:2637
+#: ../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 "
@@ -6276,40 +8864,40 @@ msgstr ""
 "aktualizovať formát súboru emoticons.py. Pre viac podrobností pozrite http://"
 "trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2668 ../src/roster_window.py:3557
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:3045
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia"
 
-#: ../src/gui_interface.py:3580
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/gui_interface.py:3581
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Vložiť heslo ku GPG kľúču pre účet %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:3595
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG kľúč vypršal"
 
-#: ../src/gui_interface.py:3596
+#: ../src/gui_interface.py:3608
 #, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Váš GPG kľúč vypršal, a preto budete pripojený do %s bez OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3605
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Nesprávna passfráza"
 
-#: ../src/gui_interface.py:3606
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zadajte znova vašu GPG passfrázu alebo stlačte Zrušiť."
 
@@ -6347,11 +8935,6 @@ msgstr "Prezývka"
 msgid "Message"
 msgstr "Správa"
 
-#. holds subject
-#: ../src/history_manager.py:188 ../src/history_manager.py:219
-msgid "Subject"
-msgstr "Predmet"
-
 #: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
@@ -6405,10 +8988,6 @@ msgstr[2] "Skutočne si želáte zmazať vybrané správy?"
 msgid "Conversation History with %s"
 msgstr "História konverzácie s %s"
 
-#: ../src/history_window.py:323
-msgid "Conversation History"
-msgstr "História konverzácie"
-
 #: ../src/history_window.py:350
 msgid "Disk Error"
 msgstr "Chyba disku"
@@ -6477,47 +9056,47 @@ msgstr "- správy budú zaznamenané"
 msgid "- messages will not be logged"
 msgstr "- správy nebudú zaznamenané"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s zmenil stav"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s sa prihlásil"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s sa odhlásil"
 
-#: ../src/notify.py:277
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nová správa od %(nickname)s"
 
-#: ../src/notify.py:284
+#: ../src/notify.py:286
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nová súkromná správa od diskusnej skupiny %s"
 
-#: ../src/notify.py:286
+#: ../src/notify.py:288
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:289
+#: ../src/notify.py:291
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr ""
 
-#: ../src/notify.py:294
+#: ../src/notify.py:297
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Správa od %(nickname)s"
 
-#: ../src/notify.py:561
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorovať"
 
@@ -6935,38 +9514,6 @@ msgstr "Všetkým používateľom"
 msgid "To all online users"
 msgstr "Všetkým pripojeným používateľom"
 
-#. Invite to
-#. Invite to Groupchat
-#: ../src/roster_window.py:5281 ../src/roster_window.py:5441
-msgid "In_vite to"
-msgstr "Poz_vať do"
-
-#: ../src/roster_window.py:5291 ../src/roster_window.py:5530
-msgid "Send Cus_tom Status"
-msgstr "Poslať vlas_tný stav"
-
-#. Rename
-#: ../src/roster_window.py:5326
-msgid "Re_name"
-msgstr "Preme_novať"
-
-#: ../src/roster_window.py:5345 ../src/roster_window.py:5473
-#: ../src/roster_window.py:5606
-msgid "_Unblock"
-msgstr "_Odblokovať"
-
-#: ../src/roster_window.py:5353 ../src/roster_window.py:5479
-#: ../src/roster_window.py:5609
-msgid "_Block"
-msgstr "_Blokovať"
-
-#. Remove group
-#. Remove
-#: ../src/roster_window.py:5363 ../src/roster_window.py:5489
-#: ../src/roster_window.py:5619
-msgid "_Remove"
-msgstr "O_dstrániť"
-
 #. Manage Transport submenu
 #: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
@@ -7002,11 +9549,6 @@ msgstr "_Upraviť transport"
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#. Information
-#: ../src/roster_window.py:5631
-msgid "_Information"
-msgstr "_Informácie"
-
 #: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "Ma_ximalizovať"
@@ -7019,10 +9561,6 @@ msgstr "Znovu p_ripojiť"
 msgid "_Disconnect"
 msgstr "O_dpojiť"
 
-#: ../src/roster_window.py:5680
-msgid "_History"
-msgstr "_História"
-
 #. History manager
 #: ../src/roster_window.py:5751
 msgid "History Manager"
@@ -7096,10 +9634,6 @@ msgstr "_Zmeniť správu o stave..."
 msgid "Hide _Roster"
 msgstr "v _zozname kontaktov"
 
-#: ../src/statusicon.py:326
-msgid "Show _Roster"
-msgstr "Zobraziť _zoznam"
-
 #: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Skryť toto menu"
@@ -7156,14 +9690,6 @@ msgstr "Zápis: "
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:652
-msgid "Mood:"
-msgstr "Nálada:"
-
-#: ../src/tooltips.py:657
-msgid "Activity:"
-msgstr "Aktivita:"
-
 #: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Pieseň:"
@@ -7225,32 +9751,28 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Čas: Neznámy"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:517
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:332
-msgid "<b>Role:</b>"
-msgstr "<b>Úloha:</b>"
-
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Pričlenenie:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -7258,7 +9780,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:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -7266,12 +9788,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:348
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -7279,15 +9801,15 @@ 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:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Nie sú tu žiadne čakajúce požiadavky o zapísanie."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:540
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " zdroj s prioritou "
 
@@ -7309,9 +9831,6 @@ msgstr " zdroj s prioritou "
 #~ msgid "_Modify Account"
 #~ msgstr "_Upraviť účet"
 
-#~ msgid "_Open Gmail Inbox"
-#~ msgstr "_Otvoriť Gmail Inbox"
-
 #~ msgid "_Personal Events"
 #~ msgstr "_Osobné udalosti"
 
@@ -7321,122 +9840,9 @@ msgstr " zdroj s prioritou "
 #~ msgid "_Status"
 #~ msgstr "_Stav"
 
-#~ msgid ""
-#~ "<b>Connecting to server</b>\n"
-#~ "\n"
-#~ "Please wait..."
-#~ msgstr ""
-#~ "<b>Pripája sa k serveru</b>\n"
-#~ "\n"
-#~ "Prosím počkajte..."
-
-#~ msgid "<b>Please choose one of the options below:</b>"
-#~ msgstr "<b>Prosím, vyberte jednu z možností dole:</b>"
-
-#~ 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>"
-
-#~ msgid "<b>Please select a server</b>"
-#~ msgstr "<b>Prosím, vyberte server</b>"
-
-#~ msgid "@"
-#~ msgstr "@"
-
-#~ 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"
-
-#~ msgid "Anon_ymous authentication"
-#~ msgstr "Anon_ymná autentifikácia"
-
-#~ msgid "Connect when I press Finish"
-#~ msgstr "Pripojiť, keď stlačím Dokončiť"
-
-#~ msgid "Gajim: Account Creation Wizard"
-#~ msgstr "Gajim: Pomocník - Tvorba účtu"
-
-#~ msgid "I already have an account I want to _use"
-#~ msgstr "Už mám účet a chcem ho po_užívať"
-
-#~ msgid "I want to _register for a new account"
-#~ msgstr "Chcem si za_registrovať nový účet"
-
-#~ 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 "Manage..."
-#~ msgstr "Spravovať..."
-
-#~ msgid "Prox_y:"
-#~ msgstr "Prox_y:"
-
-#~ msgid "Save pass_word"
-#~ msgstr "Uložiť hes_lo"
-
-#~ msgid "Set my profile when I connect"
-#~ msgstr "Nastaviť môj profil, keď som pripojený"
-
-#~ msgid "Use custom hostname/port"
-#~ msgstr "Použiť vlastný názov hostiteľa/portu"
-
-#~ msgid ""
-#~ "You need to have an account in order to connect\n"
-#~ "to the Jabber network."
-#~ msgstr ""
-#~ "Potrebujete mať účet, aby ste sa mohli pripojiť\n"
-#~ "do siete Jabber."
-
-#~ msgid "_Advanced"
-#~ msgstr "_Pokročilé"
-
-#~ msgid "_Finish"
-#~ msgstr "_Dokončiť"
-
-#~ msgid "_Hostname:"
-#~ msgstr "Názov _hostiteľa:"
-
-#~ msgid "_Jabber ID:"
-#~ msgstr "_Jabber ID:"
-
-#~ msgid "_Password:"
-#~ msgstr "_Heslo:"
-
-#~ msgid "_Port:"
-#~ msgstr "_Port:"
-
-#~ msgid "_Server:"
-#~ msgstr "_Server:"
-
-#~ msgid "<b>Miscellaneous</b>"
-#~ msgstr "<b>Rôzne</b>"
-
-#~ msgid "<b>OpenPGP</b>"
-#~ msgstr "<b>OpenPGP</b>"
-
-#~ msgid "<b>Personal Information</b>"
-#~ msgstr "<b>Osobné informácie</b>"
-
-#~ msgid "Account"
-#~ msgstr "Účet"
-
 #~ msgid "Account Modification"
 #~ msgstr "Úpravy účtu"
 
-#~ msgid "Administration operations"
-#~ msgstr "Administrátorské operácie"
-
-#~ msgid "Auto-reconnect when connection is lost"
-#~ msgstr "Automaticky pripojiť, keď zlyhá spojenie"
-
-#~ msgid "C_onnect on Gajim startup"
-#~ msgstr "Prip_ojiť sa pri štarte programu Gajim"
-
-#~ msgid "Chan_ge Password"
-#~ msgstr "Zme_niť heslo"
-
 #~ 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 "
@@ -7448,19 +9854,6 @@ msgstr " zdroj s prioritou "
 #~ "je poskytované serverom. Pri povolení tejto vlastnosti bude TLS "
 #~ "deaktivované."
 
-#~ msgid "Choose _Key..."
-#~ msgstr "Vybrať _kľúč..."
-
-#~ msgid "Click to change account's password"
-#~ msgstr "Kliknite pre zmenu hesla účtu"
-
-#~ 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 "Connection"
-#~ msgstr "Spojenie"
-
 #~ msgid "Edit Personal Information..."
 #~ msgstr "Upraviť osobné informácie..."
 
@@ -7468,197 +9861,30 @@ msgstr " zdroj s prioritou "
 #~ msgstr "Názov hostiteľ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 ""
-#~ "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ť."
-
-#~ 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 ""
 #~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 #~ "permission only for you"
 #~ msgstr ""
 #~ "Ak je zaškrtnuté, Gajim uloží heslo do ~/.gajim/config s oprávnením "
 #~ "'čitať' len pre vás"
 
-#~ msgid ""
-#~ "If checked, Gajim, when launched, will automatically connect to jabber "
-#~ "using this account"
-#~ msgstr ""
-#~ "Ak je zaškrtnuté, Gajim sa pri spustení automatický pripojí na jabber na "
-#~ "tento účet"
-
-#~ 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 ""
-#~ "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"
-
-#~ msgid "Information about you, as stored in the server"
-#~ msgstr "Informácie o vás sú uložené na serveri"
-
-#~ msgid "Personal Information"
-#~ msgstr "Osobné informácie"
-
 #~ msgid "Port: "
 #~ msgstr "Port:"
 
-#~ msgid "Priori_ty:"
-#~ msgstr "Priori_ta:"
-
-#~ 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ť"
-
-#~ msgid "Priority will change automatically according to your status."
-#~ msgstr "Priorita sa zmení automatický podľa stavu."
-
 #~ msgid "Proxy:"
 #~ msgstr "Proxy:"
 
-#~ msgid "Resour_ce:"
-#~ msgstr "Z_droj:"
-
-#~ 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 "Save _passphrase (insecure)"
 #~ msgstr "Uložiť _heslo (nie je bezpečné)"
 
-#~ msgid "Save conversation _logs for all contacts"
-#~ msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
-
 #~ msgid "Send keep-alive packets"
 #~ msgstr "Poslať pakety na udržiavanie spojenia"
 
-#~ msgid "Synch_ronize account status with global status"
-#~ msgstr "Synch_ronizovať stav účtu s globálnym stavom"
-
-#~ msgid "Synchronise contacts"
-#~ msgstr "Synchronizovať kontakty"
-
 #~ msgid "Use _SSL (legacy)"
 #~ msgstr "Použiť _SSL (historické dôvody)"
 
-#~ msgid "Use file transfer proxies"
-#~ msgstr "Použiť proxy pre prenos súborov"
-
 #~ msgid "_Adjust to status"
 #~ msgstr "_Upraviť stav"
 
-#~ msgid "_Name:"
-#~ msgstr "_Názov:"
-
-#~ msgid "<b>Proxy</b>"
-#~ msgstr "<b>Proxy</b>"
-
-#~ msgid "A_djust to status"
-#~ msgstr "_Upraviť  na stav"
-
-#~ msgid "Accounts"
-#~ msgstr "Účty"
-
-#~ msgid "Anonymous authentication"
-#~ msgstr "Anonymná autentifikácia"
-
-#~ 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 "Co_nnect on Gajim startup"
-#~ msgstr "Prip_ojiť sa pri štarte programu Gajim"
-
-#~ msgid "E-Mail:"
-#~ msgstr "E-mail:"
-
-#~ msgid "First Name:"
-#~ msgstr "Prvé meno:"
-
-#~ 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"
-
-#~ 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."
-
-#~ msgid "Last Name:"
-#~ msgstr "Posledné meno:"
-
-#~ msgid "Mer_ge accounts"
-#~ msgstr "Z_lúčiť účty"
-
-#~ msgid "Send _keep-alive packets"
-#~ msgstr "Poslať pa_kety na udržiavanie spojenia"
-
-#~ msgid "Synchroni_ze account status with global status"
-#~ msgstr "Synchroni_zovať stav účtu s globálnym stavom"
-
-#~ msgid "Use G_PG Agent"
-#~ msgstr "Použit G_PG agenta"
-
-#~ msgid "Use cust_om hostname/port"
-#~ msgstr "Použiť vlastný názov h_ostiteľa/portu"
-
-#~ msgid "Use cust_om port:"
-#~ msgstr "Použiť vlastný p_ort:"
-
-#~ msgid "_Edit Personal Information..."
-#~ msgstr "_Upraviť osobné informácie..."
-
-#~ msgid "_Enable"
-#~ msgstr "_Povoliť"
-
-#~ msgid "_Hostname: "
-#~ msgstr "Názov _hostiteľa: "
-
-#~ msgid "_Manage..."
-#~ msgstr "_Spravovať..."
-
-#~ msgid "_Port: "
-#~ msgstr "_Port: "
-
-#~ msgid "_Warn before using an insecure connection"
-#~ msgstr "V_arovať pred použitím nezabezpečeného spojenia"
-
-#~ msgid "_use HTTP__PROXY environment variable"
-#~ msgstr "po_užiť premennú prostredia HTTP__PROXY"
-
 #~ msgid "gtk-add"
 #~ msgstr "gtk-add"
 
@@ -7668,162 +9894,12 @@ msgstr " zdroj s prioritou "
 #~ msgid "gtk-remove"
 #~ msgstr "gtk-remove"
 
-#~ msgid "A_ccount:"
-#~ msgstr "Úč_et:"
-
-#~ msgid "A_llow this contact to view my status"
-#~ msgstr "P_ovoliť tomuto kontaktu vidieť môj stav"
-
-#~ msgid "Add New Contact"
-#~ msgstr "Pridať nový kontakt"
-
-#~ 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 ""
-#~ "Musíte sa registrovať pomocou tohto transportu\n"
-#~ "aby ste mohli pridať kontakt z tohto protokolu. \n"
-#~ "Pre pokračocanie kliknite na tlačidlo registrovať."
-
-#~ msgid ""
-#~ "You must be connected to the transport to be able\n"
-#~ "to add a contact from this protocol."
-#~ msgstr ""
-#~ "Musíte byť pripojený k transportu, aby ste mohli\n"
-#~ "pridať kontakt s použitím tohoto protokolu."
-
-#~ msgid "_Group:"
-#~ msgstr "_Skupina:"
-
-#~ msgid "_Nickname:"
-#~ msgstr "_Prezývka:"
-
-#~ msgid "_Protocol:"
-#~ msgstr "_Protokol:"
-
-#~ msgid "_Register"
-#~ msgstr "_Registrácia"
-
-#~ msgid "_User ID:"
-#~ msgstr "_Používateľské ID:"
-
-#~ msgid "<b>An error has occurred:</b>"
-#~ msgstr "<b>Vyskytla sa chyba:</b>"
-
-#~ msgid "<b>Choose command to execute:</b>"
-#~ msgstr "<b>Vyberte príkaz na vykonanie:</b>"
-
-#~ msgid "Ad-hoc Commands - Gajim"
-#~ msgstr "Ad-hoc príkazy - Gajim"
-
-#~ msgid "Check once more"
-#~ msgstr "Skontrolovať ešte raz"
-
-#~ msgid "Error description..."
-#~ msgstr "Popis chyby..."
-
-#~ msgid "Please wait while retrieving command list..."
-#~ msgstr "Prosím počkajte, prebieha získavanie zoznamu príkazov..."
-
-#~ msgid "Please wait while the command is sending..."
-#~ msgstr "Prosím počkajte, prebieha odosielanie príkazu..."
-
-#~ msgid "Please wait..."
-#~ msgstr "Prosím čakajte..."
-
-#~ msgid "This jabber entity does not expose any commands."
-#~ msgstr "Táto jabber entita neposkytuje žiadny príkaz."
-
-#~ msgid "<b>Description</b>"
-#~ msgstr "<b>Popis</b>"
-
-#~ 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 "Advanced Configuration Editor"
-#~ msgstr "Editor rozšírenej konfigurácie"
-
-#~ msgid "Filter:"
-#~ msgstr "Filter:"
-
 #~ msgid "Delete MOTD"
 #~ msgstr "Odstrániť správu dňa"
 
-#~ msgid "Deletes Message of the Day"
-#~ msgstr "Odstráni správu dňa"
-
-#~ msgid "Edit _Privacy Lists..."
-#~ msgstr "_Upraviť súkromné zoznamy..."
-
-#~ 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 "Set MOTD..."
-#~ msgstr "Nastaviť správu dňa..."
-
-#~ msgid "Sets Message of the Day"
-#~ msgstr "Nastavovať správu dňa"
-
-#~ msgid "Show _XML Console"
-#~ msgstr "Zobraziť _XML konzolu"
-
-#~ msgid "Update MOTD..."
-#~ msgstr "Aktualizovať správu dňa..."
-
-#~ msgid "Updates Message of the Day"
-#~ msgstr "Aktualizovať správy dňa"
-
-#~ msgid "_Administrator"
-#~ msgstr "_Administrátor"
-
 #~ msgid "_Send Server Message..."
 #~ msgstr "_Poslať serverovú správu..."
 
-#~ 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 "<b>Sounds</b>"
-#~ msgstr "<b>Zvuky</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ý"
-
-#~ msgid "Don't have "
-#~ msgstr "Nemá "
-
-#~ 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"
-
 #~ msgid ""
 #~ "Receive a Message\n"
 #~ "Contact Disconnected \n"
@@ -7843,46 +9919,6 @@ msgstr " zdroj s prioritou "
 #~ "Prenos súboru začal \n"
 #~ "Prenos súboru dokončený"
 
-#~ 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ť"
-
-#~ msgid "_Disable showing event in roster"
-#~ msgstr "Z_akázať zobrazovanie udalostí v zozname"
-
-#~ msgid "_Disable showing event in systray"
-#~ msgstr "Z_akázať zobrazovanie udalostí v oblasti systémových upozornení"
-
-#~ 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 "_Show event in systray"
-#~ msgstr "_Zobraziť udalosť v oblasti systémových upozornení"
-
-#~ msgid "and I "
-#~ msgstr "a ja"
-
 #~ msgid ""
 #~ "contact(s)\n"
 #~ "group(s)\n"
@@ -7892,160 +9928,6 @@ msgstr " zdroj s prioritou "
 #~ "skupina(y)\n"
 #~ "všetci"
 
-#~ msgid "for "
-#~ msgstr "pre "
-
-#~ msgid "when I'm in"
-#~ msgstr "keď som v"
-
-#~ msgid "Entry:"
-#~ msgstr "Záznam:"
-
-#~ msgid "Feed name:"
-#~ msgstr "Názov kanálu:"
-
-#~ msgid "Last modified:"
-#~ msgstr "Posledná zmena:"
-
-#~ msgid "New entry received"
-#~ msgstr "Prijatý nový záznam"
-
-#~ msgid "Blocked Contacts"
-#~ msgstr "Blokované kontakty"
-
-#~ msgid "A_sk to see his/her status"
-#~ msgstr "P_ožiadať jeho/ju o súhlas k zobrazeniu stavu"
-
-#~ msgid "Add Special _Notification..."
-#~ msgstr "Pridať špeciálne oz_námenie..."
-
-#~ msgid "Assign Open_PGP Key..."
-#~ msgstr "Prideliť Open_PGP kľúč..."
-
-#~ msgid "E_xecute Command..."
-#~ msgstr "Vy_konať príkaz..."
-
-#~ msgid "Edit _Groups..."
-#~ msgstr "Upraviť _skupiny..."
-
-#~ msgid "Invite _Contacts"
-#~ msgstr "Pozvať _kontakty"
-
-#~ msgid "Remo_ve"
-#~ msgstr "O_dstrániť"
-
-#~ msgid "Send Single _Message..."
-#~ msgstr "Poslať krátku _správu..."
-
-#~ msgid "Send _File..."
-#~ msgstr "Poslať _súbor..."
-
-#~ msgid "Set Custom _Avatar..."
-#~ msgstr "Nastaviť vlastný _avatar..."
-
-#~ msgid "Start _Chat"
-#~ msgstr "Začať _rozhovor"
-
-#~ msgid "Toggle End to End Encryption"
-#~ msgstr "Prepnúť na End to End šifrovanie"
-
-#~ msgid "Toggle Open_PGP Encryption"
-#~ msgstr "Prepnúť Open_PGP šifrovanie"
-
-#~ msgid "_Add to Roster..."
-#~ msgstr "_Pridať do zoznamu..."
-
-#~ msgid "_Allow him/her to see my status"
-#~ msgstr "_Povoliť jemu/jej vidieť môj stav"
-
-#~ msgid "_Forbid him/her to see my status"
-#~ msgstr "_Odmietnuť jemu/jej zobrazenie stavu"
-
-#~ msgid "_Ignore"
-#~ msgstr "_Ignorovať"
-
-#~ msgid "_Manage Contact"
-#~ msgstr "S_pravovať kontakt"
-
-#~ msgid "_Rename..."
-#~ msgstr "_Premenovať..."
-
-#~ msgid "_Subscription"
-#~ msgstr "_Požiadavky"
-
-#~ msgid "_Unignore"
-#~ msgstr "_Neignorovať"
-
-#~ msgid "Fill in the form."
-#~ msgstr "Vyplňte formulár."
-
-#~ msgid "Room Configuration"
-#~ msgstr "Konfigurácia miestnosti"
-
-#~ msgid "Edit Groups"
-#~ msgstr "Upraviť skupiny"
-
-#~ msgid "(<b>ESession</b> info)"
-#~ msgstr "(<b>ESession</b> informácie)"
-
-#~ msgid "_Verify"
-#~ msgstr "O_veriť"
-
-#~ msgid "<b>List of possible features in Gajim:</b>"
-#~ msgstr "<b>Zoznam možných funkcií v Gajim:</b>"
-
-#~ msgid "Features"
-#~ msgstr "Funkcie"
-
-#~ msgid "A list of active, completed and stopped file transfers"
-#~ msgstr "Zoznam aktívnych, dokončených a zastavených prenosov súborov"
-
-#~ msgid "Cancels the selected file transfer"
-#~ msgstr "Zrušiť prenos vybraných súborov"
-
-#~ 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 "Clean _up"
-#~ msgstr "Vyč_istiť"
-
-#~ msgid "File Transfers"
-#~ msgstr "Prenos súborov"
-
-#~ msgid "Hides the window"
-#~ msgstr "Skrývanie okien"
-
-#~ msgid "Remove file transfer from the list."
-#~ msgstr "Odstrániť prenos súboru zo zoznamu."
-
-#~ 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"
-
-#~ msgid "Shows a list of file transfers between you and others"
-#~ msgstr "Zobraziť zoznam prenosov súborov medzi vami a ostatnými"
-
-#~ msgid ""
-#~ "This action removes single file transfer from the list. If the transfer "
-#~ "is active, it is first stopped and then removed"
-#~ 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ý"
-
-#~ msgid "When a file transfer is complete show a popup notification"
-#~ msgstr "Keď je prenos súboru dokončený zobraziť vyskakovacie oznámenie"
-
-#~ msgid "_Notify me when a file transfer is complete"
-#~ msgstr "_Upozorniť ma, keď sa dokončí prenos"
-
-#~ msgid "_Pause"
-#~ msgstr "_Pozastaviť"
-
-#~ msgid "file transfers list"
-#~ msgstr "zoznam prenosu súborov"
-
-#~ msgid "<b>Chatstate Tab Colors</b>"
-#~ msgstr "<b>Farby kariet diskusného okna</b>"
-
 #~ msgid ""
 #~ "Account row\n"
 #~ "Group row\n"
@@ -8057,44 +9939,6 @@ msgstr " zdroj s prioritou "
 #~ "Riadok s kontaktom\n"
 #~ "Titulok diskusie"
 
-#~ msgid "Composing"
-#~ msgstr "Píše správu"
-
-#~ msgid "Font style:"
-#~ msgstr "Štýl fontu:"
-
-#~ msgid "Gajim Themes Customization"
-#~ msgstr "Úprava tém programu Gajim"
-
-#~ msgid "Gone"
-#~ msgstr "Minulé"
-
-#~ msgid ""
-#~ "MUC\n"
-#~ "Messages"
-#~ msgstr ""
-#~ "MUC\n"
-#~ "Správy"
-
-#~ msgid ""
-#~ "MUC Directed\n"
-#~ "Messages"
-#~ msgstr ""
-#~ "MUC prichádzajúce\n"
-#~ "správy"
-
-#~ msgid "Paused"
-#~ msgstr "Pozastavené"
-
-#~ msgid "Text _color:"
-#~ msgstr "Farba _textu:"
-
-#~ msgid "Text _font:"
-#~ msgstr "Farba _písma:"
-
-#~ msgid "_Background:"
-#~ msgstr "_Pozadie:"
-
 #~ msgid "Change _Nickname..."
 #~ msgstr "Zmeniť p_rezývku..."
 
@@ -8110,77 +9954,15 @@ msgstr " zdroj s prioritou "
 #~ msgid "_Manage Room"
 #~ msgstr "S_pravovať miestnosť"
 
-#~ msgid "_Minimize on close"
-#~ msgstr "_Minimalizovať pri zavretí"
-
-#~ msgid "Mo_derator"
-#~ msgstr "Mo_derátor"
-
 #~ msgid "Send _File"
 #~ msgstr "Poslať _súbor"
 
 #~ msgid "_Add to Roster"
 #~ msgstr "_Pridať do zoznamu"
 
-#~ msgid "_Admin"
-#~ msgstr "_Admin"
-
-#~ msgid "_Ban"
-#~ msgstr "_Zakázať"
-
-#~ msgid "_Kick"
-#~ msgstr "_Vykopnúť"
-
-#~ msgid "_Member"
-#~ msgstr "_Člen"
-
-#~ msgid "_Owner"
-#~ msgstr "_Vlastník"
-
 #~ msgid "_Send Private Message"
 #~ msgstr "_Poslať súkromnú správu"
 
-#~ msgid "_Voice"
-#~ msgstr "_Hlas"
-
-#~ msgid "Create new post"
-#~ msgstr "Vytvoriť novú správu"
-
-#~ 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 "<big><b>Welcome to Gajim History Logs Manager</b></big>"
-#~ msgstr "<big><b>Vitajte v Gajim správca histórie</b></big>"
-
-#~ msgid "Export"
-#~ msgstr "Exportovať"
-
-#~ msgid "Gajim History Logs Manager"
-#~ msgstr "Gajim - správca histórie"
-
-#~ 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 ""
-#~ "Tento správca záznamov nie je určený k prezeraniu záznamov. Ak hľadáte "
-#~ "lepšiu funkčnosť, použite na to určené okno histórie.\n"
-#~ "\n"
-#~ "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."
-
-#~ msgid "_Search Database"
-#~ msgstr "_Hľadať v databáze"
-
 #~ msgid ""
 #~ "Enter JID or Contact name\n"
 #~ "Groupchat Histories\n"
@@ -8190,45 +9972,6 @@ msgstr " zdroj s prioritou "
 #~ "História diskusných skupín\n"
 #~ "História všetkých rozhovorov"
 
-#~ msgid "Search:"
-#~ msgstr "Hľadať:"
-
-#~ msgid "_Log conversation history"
-#~ msgstr "Zaznamenávať históriu k_onverzácie"
-
-#~ msgid "<b>Message:</b> "
-#~ msgstr "<b>Správa:</b> "
-
-#~ msgid "Set Activity"
-#~ msgstr "Nastaviť aktivitu"
-
-#~ msgid "Set an activity"
-#~ msgstr "Nastaviť aktivitu"
-
-#~ msgid "<b>Message:</b>"
-#~ msgstr "<b>Správa:</b>"
-
-#~ msgid "<b>Mood:</b>"
-#~ msgstr "<b>Nálada:</b>"
-
-#~ msgid "Change Password"
-#~ msgstr "Zmeniť heslo"
-
-#~ msgid "Enter it again for confirmation:"
-#~ msgstr "Vložte ešte raz pre potvrdenie:"
-
-#~ msgid "Enter new password:"
-#~ msgstr "Vložte nové heslo:"
-
-#~ msgid "<b>Type your new status message</b>"
-#~ msgstr "<b>Zadajte vašu novú správu o stave</b>"
-
-#~ msgid "Preset messages:"
-#~ msgstr "Prednastavené správy:"
-
-#~ msgid "Save as Preset..."
-#~ msgstr "Uložiť ako prednastavené..."
-
 #~ msgid "Join _Group Chat"
 #~ msgstr "_Pripojiť sa k diskusnej skupine"
 
@@ -8247,72 +9990,12 @@ msgstr " zdroj s prioritou "
 #~ msgid "_Start Chat"
 #~ msgstr "_Začať rozhovor"
 
-#~ msgid "In_vite"
-#~ msgstr "Poz_vať"
-
-#~ msgid "Invite Friends!"
-#~ msgstr "Pozvať priateľov!"
-
-#~ msgid "MUC server"
-#~ msgstr "MUC server"
-
-#~ msgid "Please select a MUC server."
-#~ msgstr "Prosím, zvolte MUC server."
-
-#~ msgid "Bookmark this room"
-#~ msgstr "Zazáložkovať túto miestnosť"
-
-#~ msgid "Join this room automatically when I connect"
-#~ msgstr "Prihlásiť sa do miestnosti automaticky, keď sa pripojím"
-
-#~ msgid "Nickname:"
-#~ msgstr "Prezývka:"
-
-#~ msgid "Password:"
-#~ msgstr "Heslo:"
-
-#~ msgid "Recently:"
-#~ msgstr "Posledné:"
-
-#~ msgid "Room:"
-#~ msgstr "Miestnosť:"
-
 #~ msgid "Manage Accounts"
 #~ msgstr "Spravovať účty"
 
-#~ msgid "Auto join"
-#~ msgstr "Automaticky pripojiť"
-
-#~ msgid "If checked, Gajim will join this group chat on startup"
-#~ msgstr "Ak je zaškrtnuté, Gajim sa pripojí do diskusnej skupiny pri štarte"
-
-#~ msgid "Manage Bookmarks"
-#~ msgstr "Spravovať záložky"
-
-#~ msgid "Minimize on Auto Join"
-#~ msgstr "Minimalizovať pri automatickom pripojení"
-
-#~ msgid "Print status:"
-#~ msgstr "Vypísať stav:"
-
-#~ msgid "Title:"
-#~ msgstr "Titulok:"
-
-#~ msgid "PEP Service Configuration"
-#~ msgstr "Konfigurácia služby PEP"
-
-#~ msgid "_Configure"
-#~ msgstr "_Nastavovať"
-
 #~ msgid "gtk-delete"
 #~ msgstr "gtk-delete"
 
-#~ msgid "<b>Properties</b>"
-#~ msgstr "<b>Predvoľby</b>"
-
-#~ msgid "<b>Settings</b>"
-#~ msgstr "<b>Nastavenia</b>"
-
 #~ msgid ""
 #~ "HTTP Connect\n"
 #~ "SOCKS5\n"
@@ -8322,66 +10005,6 @@ msgstr " zdroj s prioritou "
 #~ "SOCKS5\n"
 #~ "BOSH"
 
-#~ msgid "Manage Proxy Profiles"
-#~ msgstr "Spravovať Proxy profily"
-
-#~ msgid "Pass_word:"
-#~ msgstr "He_slo:"
-
-#~ msgid "Proxy _Host:"
-#~ msgstr "_Hostiteľ proxy:"
-
-#~ msgid "Proxy _Port:"
-#~ msgstr "_Port proxy:"
-
-#~ msgid "Use HTTP prox_y"
-#~ msgstr "Použiť HTTP prox_y"
-
-#~ msgid "Use proxy auth_entication"
-#~ msgstr "Použiť proxy aut_entifikáciu"
-
-#~ msgid "_BOSH URL:"
-#~ msgstr "_BOSH URL:"
-
-#~ msgid "_Type:"
-#~ msgstr "_Typ:"
-
-#~ msgid "_Username:"
-#~ msgstr "_Používateľské meno:"
-
-#~ msgid "*"
-#~ msgstr "*"
-
-#~ msgid "0"
-#~ msgstr "0"
-
-#~ msgid "1"
-#~ msgstr "1"
-
-#~ msgid "2"
-#~ msgstr "2"
-
-#~ msgid "3"
-#~ msgstr "3"
-
-#~ msgid "4"
-#~ msgstr "4"
-
-#~ msgid "5"
-#~ msgstr "5"
-
-#~ msgid "6"
-#~ msgstr "6"
-
-#~ msgid "7"
-#~ msgstr "7"
-
-#~ msgid "8"
-#~ msgstr "8"
-
-#~ msgid "9"
-#~ msgstr "9"
-
 #~ msgid "Add this contact to roster (Ctrl+D)"
 #~ msgstr "Pridať tento kontakt do zoznamu (Ctrl+D)"
 
@@ -8416,81 +10039,12 @@ msgstr " zdroj s prioritou "
 #~ msgid "Show the contact's profile (Ctrl+I)"
 #~ msgstr "Zobraziť profil kontaktu (Ctrl+I)"
 
-#~ msgid "Sound volume:"
-#~ msgstr "Hlasitosť zvuku:"
-
 #~ msgid "Toggle audio session"
 #~ msgstr "Prepnúť zvukovú reláciu"
 
 #~ msgid "Toggle video session"
 #~ msgstr "Prepnúť video reláciu"
 
-#~ msgid "Passphrase"
-#~ msgstr "Passfráza"
-
-#~ msgid "<b>Advanced Configuration Editor</b>"
-#~ msgstr "<b>Editor rozšírenej konfigurácie</b>"
-
-#~ msgid "<b>Applications</b>"
-#~ msgstr "<b>Aplikácie</b>"
-
-#~ msgid "<b>Audio</b>"
-#~ msgstr "<b>Zvuk</b>"
-
-#~ msgid "<b>Auto Status</b>"
-#~ msgstr "<b>Automatický stav</b>"
-
-#~ msgid "<b>Chat Appearance</b>"
-#~ msgstr "<b>Vzhľad rozhovoru</b>"
-
-#~ msgid "<b>Chat Line Colors</b>"
-#~ msgstr "<b>Farby riadku rozhovoru</b>"
-
-#~ msgid "<b>Chat state notifications</b>"
-#~ msgstr "<b>Oznámenia stavu rozhovoru</b>"
-
-#~ msgid "<b>Connection</b>"
-#~ msgstr "<b>Pripojenie</b>"
-
-#~ msgid "<b>Custom</b>"
-#~ msgstr "<b>Vlastné</b>"
-
-#~ msgid "<b>Font</b>"
-#~ msgstr "<b>Písmo</b>"
-
-#~ msgid "<b>GMail Options</b>"
-#~ msgstr "<b>Nastavenia GMail</b>"
-
-#~ msgid "<b>Preset Status Messages</b>"
-#~ msgstr "<b>Vrátiť pôvodnú správu o stave</b>"
-
-#~ msgid "<b>Privacy</b>"
-#~ msgstr "<b>Súkromie</b>"
-
-#~ msgid "<b>Roster Appearance</b>"
-#~ msgstr "<b>Vzhľad zoznamu</b>"
-
-#~ msgid "<b>Status Messages</b>"
-#~ msgstr "<b>Správy o stave</b>"
-
-#~ msgid "<b>Themes</b>"
-#~ msgstr "<b>Témy</b>"
-
-#~ msgid "<b>Video</b>"
-#~ msgstr "<b>Video</b>"
-
-#~ msgid "<b>Visual Notifications</b>"
-#~ msgstr "<b>Vizuálne oznámenie</b>"
-
-#~ msgid "<i>(example: stunserver.org)</i>"
-#~ msgstr "<i>(príklad: stunserver.org)</i>"
-
-#~ msgid "Advanced"
-#~ msgstr "Pokročilé"
-
-#~ msgid "Advanced..."
-#~ msgstr "Pokročilé..."
-
 #~ msgid ""
 #~ "All chat states\n"
 #~ "Composing only\n"
@@ -8500,26 +10054,6 @@ msgstr " zdroj s prioritou "
 #~ "Len pri písaní\n"
 #~ "Zakázané"
 
-#~ msgid "Allow _OS information to be sent"
-#~ msgstr "Povoliť _odosielanie informácie o operačnom systéme"
-
-#~ 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 "Allow sound when I'm _busy"
-#~ msgstr "Povoliť zvuk keď som zane_prázdnený"
-
-#~ msgid "Ask status message when I:"
-#~ msgstr "Vyžiadať správu o stave, keď som:"
-
-#~ msgid "Audio input device"
-#~ msgstr "Vstupné zariadenie zvuku"
-
-#~ msgid "Audio output device"
-#~ msgstr "Výstupné zariadenie zvuku"
-
 #~ msgid ""
 #~ "Autodetect on every Gajim startup\n"
 #~ "Always use GNOME default applications\n"
@@ -8533,21 +10067,6 @@ msgstr " zdroj s prioritou "
 #~ "Vždy použiť štandartné aplikácie Xfce\n"
 #~ "Vlastné"
 
-#~ msgid "Chat message:"
-#~ msgstr "Správa rozhovoru:"
-
-#~ msgid "Check on startup if Gajim is the _default Jabber client"
-#~ msgstr "Kontrolovať pri spustení, či je Gajim pre_dvoleným Jabber klientom"
-
-#~ msgid "Configure color and font of the interface"
-#~ msgstr "Nastavovať farbu a písmo rozhrania"
-
-#~ msgid "Contact's message:"
-#~ msgstr "Správa kontaktu:"
-
-#~ msgid "Contact's nickname:"
-#~ msgstr "Prezývka kontaktu:"
-
 #~ msgid ""
 #~ "Detached roster with detached chats\n"
 #~ "Detached roster with single chat\n"
@@ -8561,207 +10080,6 @@ msgstr " zdroj s prioritou "
 #~ "Oddelený zoznam od spojených rozhovorov podľa účtu\n"
 #~ "Oddelený zoznam od spojených rozhovorov podľa typu"
 
-#~ msgid "Display _activity of contacts in roster"
-#~ msgstr "Zobraziť _aktivitu kontaktov v zozname kontaktov"
-
-#~ msgid "Display _extra email details"
-#~ msgstr "Zobraziť ďalši_e podrobnosti o e-maile"
-
-#~ msgid "Display _location of contacts in roster"
-#~ msgstr "Zobraziť _pozíciu kontaktov v zozname"
-
-#~ msgid "Display _tunes of contacts in roster"
-#~ msgstr "Zobraziť _hudbu kontaktov v zozname kontaktov"
-
-#~ msgid "Display a_vatars of contacts in roster"
-#~ msgstr "Zobraziť a_vatary v zozname kontaktov"
-
-#~ msgid "Display m_ood of contacts in roster"
-#~ msgstr "Zobraziť _náladu kontaktov v zozname kontaktov"
-
-#~ msgid "Display status _messages of contacts in roster"
-#~ msgstr "Zobraziť stavovú _informáciu kontaktov v zozname kontaktov"
-
-#~ 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 môže odoslať a prijať meta-informácie vzťahujúce sa ku konverzácii "
-#~ "s inou osobou. Tu môžete vybrať stavy, ktoré majú byť zobrazované v "
-#~ "diskusnom okne."
-
-#~ 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 môže odoslať a prijať meta-informácie vzťahujúce sa ku konverzácii "
-#~ "s vašim kontaktom. Tu môžete vybrať stavy, o ktorých majú byť odosielané "
-#~ "informácie druhej strane."
-
-#~ 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"
-
-#~ msgid "Hide all buttons in chat windows"
-#~ msgstr "Skryje všetky tlačidlá v oknách rozhovorov"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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č."
-
-#~ 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 ""
-#~ "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 ""
-#~ "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 ""
-#~ "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 mood 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 ""
-#~ "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 ""
-#~ "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"
-
-#~ 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"
-
-#~ 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ď...)"
-
-#~ 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."
-
-#~ 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"
-
-#~ msgid "Log _encrypted chat session"
-#~ msgstr "Zaznamenať reláciu šifrova_ného rozhovoru"
-
-#~ msgid "Ma_ke message windows compact"
-#~ msgstr "Zmeniť okno správ na _kompaktné"
-
-#~ msgid "Ma_nage..."
-#~ msgstr "_Spravovať..."
-
-#~ msgid ""
-#~ "Never\n"
-#~ "Only when pending events\n"
-#~ "Always"
-#~ msgstr ""
-#~ "Nikdy\n"
-#~ "Len ak čakajú udalosti\n"
-#~ "Vždy"
-
-#~ msgid "Notifications"
-#~ msgstr "Oznámenia"
-
-#~ msgid "Notify me about contacts that sign _in"
-#~ msgstr "Upozorniť ma, keď sa kontakty pr_ihlásia"
-
-#~ msgid "Notify me about contacts that sign _out"
-#~ msgstr "Upozorniť ma, keď sa kontakty _odhlásia"
-
-#~ msgid "Notify on new _GMail email"
-#~ msgstr "Upozorniť keď príde na _Gmail e-mail"
-
-#~ msgid "Personal Events"
-#~ msgstr "Osobné udalosti"
-
-#~ msgid "Play _sounds"
-#~ msgstr "Prehrať _zvuky"
-
 #~ msgid ""
 #~ "Pop it up\n"
 #~ "Notify me about it\n"
@@ -8771,181 +10089,6 @@ msgstr " zdroj s prioritou "
 #~ "Upozorniť ma o tom\n"
 #~ "Zobraziť len v zozname kontaktov"
 
-#~ msgid "Preferences"
-#~ msgstr "Predvoľby"
-
-#~ msgid "STUN server:"
-#~ msgstr "STUN server:"
-
-#~ msgid "Show systray:"
-#~ msgstr "Zobraziť oblasť systémových upozornení:"
-
-#~ msgid "Sign _in"
-#~ msgstr "Prihlás_il sa"
-
-#~ msgid "Sign _out"
-#~ msgstr "_Odhlásil sa"
-
-#~ 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 "Sort contacts by status"
-#~ msgstr "Usporiadať kontakty podľa stavu"
-
-#~ msgid "Status _iconset:"
-#~ msgstr "Zostava stavových _ikôn:"
-
-#~ msgid "Style"
-#~ msgstr "Štýl"
-
-#~ msgid "T_heme:"
-#~ msgstr "_Téma:"
-
-#, 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"
-
-#, 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 "Use _transports icons"
-#~ msgstr "Použiť ikony _transportov"
-
-#~ msgid "Use system _default"
-#~ msgstr "Použiť systémové _nastavenia"
-
-#~ msgid "Video input device"
-#~ msgstr "Vstupné zariadenie videa"
-
-#~ msgid "Video output device"
-#~ msgstr "Výstupné zariadenie videa"
-
-#~ msgid "When new event is received:"
-#~ msgstr "Keď nastane nová udalosť:"
-
-#~ msgid "Your message:"
-#~ msgstr "Vaša správa:"
-
-#~ msgid "Your nickname:"
-#~ msgstr "Vaša prezývka:"
-
-#~ msgid "_Away after:"
-#~ msgstr "_Preč po:"
-
-#~ msgid "_Browser:"
-#~ msgstr "_Prehliadač:"
-
-#~ msgid "_Display chat state notifications:"
-#~ msgstr "Zo_braziť oznámenia o stave rozhovoru:"
-
-#~ msgid "_Emoticons:"
-#~ msgstr "_Emotikony:"
-
-#~ msgid "_File manager:"
-#~ msgstr "_Správca súborov:"
-
-#~ msgid "_Highlight misspelled words"
-#~ msgstr "_Zvýrazniť zle napísané slová"
-
-#~ msgid "_Ignore events from contacts not in the roster"
-#~ msgstr "_Ignorovať udalosti od kontaktov, ktoré nie sú v zozname"
-
-#~ msgid "_Ignore rich content in incoming messages"
-#~ msgstr "_Ignorovať rozšírený obsah prichádzajúcich správ"
-
-#~ msgid "_Log status changes of contacts"
-#~ msgstr "_Zaznamenať zmenu stavu kontaktu"
-
-#~ msgid "_Mail client:"
-#~ msgstr "_E-mailový klient:"
-
-#~ msgid "_Not available after:"
-#~ msgstr "_Neprítomný po:"
-
-#~ msgid "_Open..."
-#~ msgstr "_Otvoriť..."
-
-#~ msgid "_Reset to Default Colors"
-#~ msgstr "Náv_rat k pôvodnému nastaveniu farieb"
-
-#~ msgid "_Send chat state notifications:"
-#~ msgstr "Odo_slať oznámenia o stave rozhovoru:"
-
-#~ msgid "_Status message:"
-#~ msgstr "_Správa o stave:"
-
-#~ msgid "_URL highlight:"
-#~ msgstr "Zvýrazňovanie _URL:"
-
-#~ msgid "_Window behavior:"
-#~ msgstr "_Správanie okna:"
-
-#~ msgid "in _group chats"
-#~ msgstr "v _diskusných skupiných"
-
-#~ msgid "minutes"
-#~ msgstr "minút"
-
-#~ msgid "Privacy Lists:"
-#~ msgstr "Súkromné zoznamy:"
-
-#~ msgid "<b>Add / Edit a rule</b>"
-#~ msgstr "<b>Pridať / zmeniť pravidlo</b>"
-
-#~ msgid "<b>List of rules</b>"
-#~ msgstr "<b>Zoznam pravidiel</b>"
-
-#~ msgid "<i>Privacy List</i>"
-#~ msgstr "<i>Súkromný zoznam</i>"
-
-#~ msgid "Active for this session"
-#~ msgstr "Aktívne pre toto sedenie"
-
-#~ msgid "Active on each startup"
-#~ msgstr "Aktivovať pri každom spustení"
-
-#~ msgid "All"
-#~ msgstr "Všetko"
-
-#, fuzzy
-#~ msgid "All (including subscription)"
-#~ msgstr "všetko podľa podpisu"
-
-#~ msgid "Allow"
-#~ msgstr "Povoliť"
-
-#~ msgid "Deny"
-#~ msgstr "Zakázať"
-
-#~ msgid "JabberID"
-#~ msgstr "JabberID"
-
-#~ msgid "Order:"
-#~ msgstr "Poradie:"
-
-#~ msgid "all by subscription"
-#~ msgstr "všetko podľa podpisu"
-
-#~ msgid "all in the group"
-#~ msgstr "všetko v skupine"
-
 #~ msgid ""
 #~ "none\n"
 #~ "both\n"
@@ -8957,111 +10100,6 @@ msgstr " zdroj s prioritou "
 #~ "od\n"
 #~ "k"
 
-#~ msgid "to send me messages"
-#~ msgstr "poslať mi správu"
-
-#~ msgid "to send me queries"
-#~ msgstr "poslať mi požiadavky"
-
-#~ msgid "to send me status"
-#~ msgstr "poslať mi stav"
-
-#~ msgid "to view my status"
-#~ msgstr "vidieť môj stav"
-
-#~ msgid "<b>Address</b>"
-#~ msgstr "<b>Adresa</b>"
-
-#~ msgid "<b>Avatar:</b>"
-#~ msgstr "<b>Avatar:</b>"
-
-#~ msgid "<b>Birthday:</b>"
-#~ msgstr "<b>Narodeniny:</b>"
-
-#~ msgid "<b>City:</b>"
-#~ msgstr "<b>Mesto:</b>"
-
-#~ msgid "<b>Company:</b>"
-#~ msgstr "<b>Spoločnosť:</b>"
-
-#~ msgid "<b>Country:</b>"
-#~ msgstr "<b>Krajina:</b>"
-
-#~ msgid "<b>Department:</b>"
-#~ msgstr "<b>Oddelenie:</b>"
-
-#~ msgid "<b>E-Mail:</b>"
-#~ msgstr "<b>E-mail:</b>"
-
-#~ msgid "<b>Extra Address:</b>"
-#~ msgstr "<b>Ďaľšia adresa:</b>"
-
-#~ msgid "<b>Family:</b>"
-#~ msgstr "<b>Priezvisko:</b>"
-
-#~ msgid "<b>Full Name</b>"
-#~ msgstr "<b>Celé meno</b>"
-
-#~ msgid "<b>Given:</b>"
-#~ msgstr "<b>Krstné meno:</b>"
-
-#~ msgid "<b>Homepage:</b>"
-#~ msgstr "<b>Domovská stránka:</b>"
-
-#~ msgid "<b>Middle:</b>"
-#~ msgstr "<b>Druhé meno:</b>"
-
-#~ msgid "<b>Name:</b>"
-#~ msgstr "<b>Meno:</b>"
-
-#~ msgid "<b>Nickname:</b>"
-#~ msgstr "<b>Prezývka:</b>"
-
-#~ msgid "<b>Phone No.:</b>"
-#~ msgstr "<b>Telefónne č.:</b>"
-
-#~ msgid "<b>Position:</b>"
-#~ msgstr "<b>Pozícia:</b>"
-
-#~ msgid "<b>Postal Code:</b>"
-#~ msgstr "<b>PSČ:</b>"
-
-#~ msgid "<b>Prefix:</b>"
-#~ msgstr "<b>Titul pred:</b>"
-
-#~ msgid "<b>State:</b>"
-#~ msgstr "<b>Štát:</b>"
-
-#~ msgid "<b>Street:</b>"
-#~ msgstr "<b>Ulica:</b>"
-
-#~ msgid "<b>Suffix:</b>"
-#~ msgstr "<b>Titul za:</b>"
-
-#~ msgid "About"
-#~ msgstr "O mne"
-
-#~ msgid "Click to set your avatar"
-#~ msgstr "Kliknite pre výber avataru"
-
-#~ msgid "Format: YYYY-MM-DD"
-#~ msgstr "Formát: YYYY-MM-DD"
-
-#~ msgid "Personal Info"
-#~ msgstr "Osobné informácie"
-
-#~ msgid "Work"
-#~ msgstr "Práca"
-
-#~ msgid "<b>What do you want to do?</b>"
-#~ msgstr "<b>Čo si prajete vykonať?</b>"
-
-#~ msgid "Remove account from Gajim and from _server"
-#~ msgstr "Odstrániť účet z Gajim aj zo _serveru"
-
-#~ msgid "_OK"
-#~ msgstr "_OK"
-
 #~ msgid "gtk-cancel"
 #~ msgstr "gtk-cancel"
 
@@ -9074,39 +10112,18 @@ msgstr " zdroj s prioritou "
 #~ msgid "File _Transfers"
 #~ msgstr "Prenos _súborov"
 
-#~ msgid "Frequently Asked Questions (online)"
-#~ msgstr "Často kladené otázky (online)"
-
-#~ msgid "Help online"
-#~ msgstr "Pomocník online"
-
 #~ msgid "Profile, A_vatar"
 #~ msgstr "Profil, a_vatar"
 
-#~ msgid "Show Only _Active Contacts"
-#~ msgstr "Zobraziť len _aktívne kontakty"
-
-#~ msgid "Show Trans_ports"
-#~ msgstr "Zobraziť trans_porty"
-
-#~ msgid "Show _Offline Contacts"
-#~ msgstr "Zobraziť _odhlásené kontakty"
-
 #~ msgid "_Accounts"
 #~ msgstr "Úč_ty"
 
-#~ msgid "_Actions"
-#~ msgstr "_Akcie"
-
 #~ msgid "_Contents"
 #~ msgstr "Ob_sah"
 
 #~ msgid "_FAQ"
 #~ msgstr "Často k_ladené otázky"
 
-#~ msgid "_Help"
-#~ msgstr "_Pomocník"
-
 #~ msgid "_Preferences"
 #~ msgstr "_Predvoľby"
 
@@ -9116,166 +10133,21 @@ msgstr " zdroj s prioritou "
 #~ msgid "_Send Single Message..."
 #~ msgstr "Poslať krátku _správu..."
 
-#~ msgid "_View"
-#~ msgstr "_Zobraziť"
-
-#~ msgid "Search"
-#~ msgstr "Hľadať"
-
-#~ msgid "_Add contact"
-#~ msgstr "_Pridať kontakt"
-
-#~ msgid "G_o"
-#~ msgstr "Ch_oď"
-
-#~ msgid "_Address:"
-#~ msgstr "_Adresa:"
-
-#~ msgid "Register to"
-#~ msgstr "Registrovaný na"
-
-#~ msgid "_Cancel"
-#~ msgstr "_Zrušiť"
-
-#~ msgid "From:"
-#~ msgstr "Od:"
-
-#~ msgid "Reply to this message"
-#~ msgstr "Odpoveď na túto správu"
-
-#~ msgid "Sen_d"
-#~ msgstr "Poš_li"
-
-#~ msgid "Send message"
-#~ msgstr "Poslať správu"
-
-#~ msgid "Send message and close window"
-#~ msgstr "Poslať správu a zatvoriť okno"
-
-#~ msgid "Subject:"
-#~ msgstr "Predmet:"
-
-#~ msgid "To:"
-#~ msgstr "Pre:"
-
-#~ msgid "_Reply"
-#~ msgstr "_Odpovedať"
-
-#~ msgid "_Send & Close"
-#~ msgstr "_Poslať a zatvoriť"
-
-#~ msgid "Au_thorize"
-#~ msgstr "Au_torizovať"
-
-#~ msgid "Subscription Request"
-#~ msgstr "Požiadavka o zapísanie"
-
-#~ msgid "_Deny"
-#~ msgstr "_Zakázať"
-
-#~ msgid "Select the account with which you want to synchronise"
-#~ msgstr "Zvoľte účet, s ktorým sa chcete synchronizovať"
-
-#~ msgid "Select the contacts you want to synchronise"
-#~ msgstr "Vyberte kontakty, ktoré chcete synchronizovať"
-
-#~ msgid "Synchronise : select contacts"
-#~ msgstr "Synchronizovať: vyberte kontakty"
-
-#~ msgid "Mute Sounds"
-#~ msgstr "Stlmiť zvuky"
-
 #~ msgid "Send Single _Message"
 #~ msgstr "Poslať krátku _správu"
 
-#~ msgid "Show All Pending _Events"
-#~ msgstr "Zobraziť všetky čakajúce _udalosti"
-
 #~ msgid "Sta_tus"
 #~ msgstr "S_tav"
 
 #~ msgid "_Group Chat"
 #~ msgstr "_Diskusná skupina"
 
-#~ msgid "<b>Ask:</b>"
-#~ msgstr "<b>Požiadavka:</b>"
-
-#~ msgid "<b>Client:</b>"
-#~ msgstr "<b>Klient:</b>"
-
-#, fuzzy
-#~ msgid "<b>Contact time:</b>"
-#~ msgstr "<b>Štát:</b>"
-
-#~ msgid "<b>Jabber ID:</b>"
-#~ msgstr "<b>Jabber ID:</b>"
-
-#~ msgid "<b>Resource:</b>"
-#~ msgstr "<b>Zdroj:</b>"
-
-#~ msgid "<b>Status:</b>"
-#~ msgstr "<b>Stav:</b>"
-
-#~ msgid "<b>Subscription:</b>"
-#~ msgstr "<b>Podpis:</b>"
-
-#~ msgid "<b>System:</b>"
-#~ msgstr "<b>Systém:</b>"
-
-#~ msgid "Comments"
-#~ msgstr "Komentáre"
-
-#~ msgid "Configured avatar:"
-#~ msgstr "Nastavovaný avatar:"
-
-#~ msgid "Contact"
-#~ msgstr "Kontakt"
-
-#~ msgid "Contact Information"
-#~ msgstr "Kontaktné informácie"
-
-#~ msgid "More"
-#~ msgstr "Viac"
-
-#~ msgid "User avatar:"
-#~ msgstr "Používa avatar:"
-
-#~ msgid "<b>Jabber Traffic</b>"
-#~ msgstr "<b>Jabber prevádzka</b>"
-
-#~ msgid "<b>XML Input</b>"
-#~ msgstr "<b>XML vstup</b>"
-
 #~ msgid "Enable"
 #~ msgstr "Povoliť"
 
-#~ msgid "Info/Query"
-#~ msgstr "Info/Požiadavka"
-
-#~ msgid "_IQ"
-#~ msgstr "_IQ"
-
-#~ msgid "_Message"
-#~ msgstr "_Správa"
-
-#~ msgid "_Presence"
-#~ msgstr "_Prítomnosť"
-
 #~ msgid "_Modify Account..."
 #~ msgstr "_Upraviť účet"
 
-#~ msgid "Local jid:"
-#~ msgstr "Miestne jid:"
-
-#~ msgid "Personal"
-#~ msgstr "Osobné"
-
-#~ msgid "Resource:"
-#~ msgstr "Zdroj:"
-
-#~ msgid "Status:"
-#~ msgstr "Stav:"
-
 #~ msgid "Banners and clickable links"
 #~ msgstr "Bannery a odkazy na ktoré ide kliknuť"
 
@@ -9390,12 +10262,6 @@ msgstr " zdroj s prioritou "
 #~ msgid "[This message is encrypted]"
 #~ msgstr "[Táto správa je šifrovaná]"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Vždy použiť štandartné aplikácie OS/X"
-
-#~ msgid "Custom"
-#~ msgstr "Vlastný"
-
 #~ msgid "%i days ago"
 #~ msgstr "Pred %i dňami"
 
diff --git a/po/sr.po b/po/sr.po
index 22c11c8d1..66fb819c2 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -20,59 +20,11 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Џабер клијент"
-
-#: ../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 Клијент"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Прикључи се _групном разговору..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Додај контакт..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Откривање сервиса"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Изврши наредбу..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "Измени налог"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Отвори Гмаил долазну пошту"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "Лични догађаји"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Започни разговор"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Статус"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -82,23 +34,23 @@ msgstr ""
 "\n"
 "Молимо причекајте..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Молимо одаберите једну од опција испод:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Молимо попуните податке за Ваш постојећи кориснички налог</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Молимо одаберите сервер</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -106,57 +58,64 @@ msgstr ""
 "Додајте овај сертификат листи сертификата којима верујете\n"
 "SHA1 потпис сертификата:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Анон_имно пријављивање"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Повежи се када притиснем Заврши"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Гајим: чаробњак за креирање налога"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Већ имам налог који желим да користим"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Желим да региструјем нови налог"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Ако је означено, Гајим ће памтити лозинку за овај налог"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Подеси..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ништа"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Прок_си:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Сними лозинку"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Постави мој профил при повезивању"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Користи Ваше одређено име хоста/порт "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -164,147 +123,141 @@ msgstr ""
 "Морате поседовати рачун да бисте се могли повезати\n"
 "на џабер мрежу."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Напредно"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Заврши"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "Име хоста:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Џабер ИД:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Лозинка:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Остало</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Личне информације</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Измена налога"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Налози"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Администраторске операције"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Анонимно пријављивање"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Аутоматско повезивање када се веза изгуби"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "По_вежи се приликом покретања Гајима"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "И_змени лозинку"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Означите ово да бисте се повезали на порт 5223 где се предпоставља да "
-"старији сервери имају SSL  могућности. Приметите да Гајим користи "
-"подразумевано TLS енкрипцију акоје сервер тражи, а са ово опцијом "
-"омогућеном, TLS ће бити искључен"
+"Означите ово да Вас Гајим пита пре него што пошаљете лозинку преко несигурне "
+"везе."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Одаберите _Кључ"
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Кликните за измену лозинке Вашег налога"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Кликните да затражите ауторизацију свим контактима другог налога"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "По_вежи се приликом покретања Гајима"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Веза"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Измени личне информације"
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Е-мејл:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Име:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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 "Гајим"
 
 #. FIXME: Ugly workaround.
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
-#: ../data/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Опште"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Име хоста"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -312,8 +265,11 @@ msgstr ""
 "Ако је ово означено, Гајим ће одашиљати још неке ИП адресе поред Ваше,тако "
 "да пренос датотека има веће шансе да ће радити."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "Ако је означено, Гајим ће узети лозинку од GPG агента"
+
+#: ../data/gui/accounts_window.ui.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -321,16 +277,7 @@ msgstr ""
 "Ако је ово означено, Гајим ће слати поруке да је присутан како би спречио "
 "прекид везе због дуге неактивности"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Ако је ово означено, Гајим ће чувати лозинке у ~/.gajim/config са 'читај' "
-"привилегијом само за Вас"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -338,8 +285,7 @@ msgstr ""
 "Ако је ово означено, Гајим ће се при сваком покретању аутоматски повезати на "
 "џабер користећи овај налог"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -349,47 +295,49 @@ msgstr ""
 "падајућег менија на дну прозора контакт листе) ће променити и статус овог "
 "налога "
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"Ако је подразумевани порт који се користи за долазне поруке неодговарајући "
+"за Ваша подешавања, овде можете одабрати неки други.\n"
+"Могли бисте узети у обзир и могућност измене подешавања firewall-а."
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Информације о Вама, како су ускладиштене на серверу"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 "Џабер ИД:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Презиме:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Споји налоге"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Није одабран ниједан кључ"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Ништа"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Личне Информације"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Порт:"
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Приори_тет"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -399,22 +347,20 @@ msgstr ""
 "случају да су два или више клијената повезана на њега; клијент са највећим "
 "приоритетомдобија догађаје"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Приоритет ће бити аутоматски промењен према Вашем статусу."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Прокси:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Преи_менуј"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Ресур_с:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -427,199 +373,89 @@ msgstr ""
 "можете бити спојени са ресурсом 'Посао' или 'Кућа', клијент са највишим "
 "приоритетом ће добијати обавештења о догађајима"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Сними :лозинку (несигурно)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Сними дневник разговора за све контакте"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Шаљи податке о живости"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Шаљи подат_ке о живости"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Синхронизирај статус налога са глобалним статусом"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Синхронизуј контакте"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Користи _SSL (застарело)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Користи прокси за пренос датотека"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Подеси према статусу"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Име:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Прокси</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "По_деси према статусу"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Налози"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Анонимно пријављивање"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Означите ово да Вас Гајим пита пре него што пошаљете лозинку преко несигурне "
-"везе."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "По_вежи се приликом покретања Гајима"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Е-мејл:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Име:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ако је означено, Гајим ће узети лозинку од GPG агента"
-
-#: ../data/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"Ако је подразумевани порт који се користи за долазне поруке неодговарајући "
-"за Ваша подешавања, овде можете одабрати неки други.\n"
-"Могли бисте узети у обзир и могућност измене подешавања firewall-а."
-
-#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Џабер ИД:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Презиме:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Споји налоге"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Преи_менуј"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Шаљи подат_ке о живости"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Синхрони_зуј статус налога са глобалним статусом"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Синхронизуј контакте"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Користи G_PG агента"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "К_ористи Ваше одређено име хоста/порт "
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "К_ористи свој порт:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Користи прокси за пренос датотека"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "Изм_ени личне информације..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Омогући"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "Име _хоста:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Подеси..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Порт:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "Упозори пре коришћења несигурне везе"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "користи HTTP_PROXY променљив_у окружења"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Налог:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/gui/add_new_contact_window.ui.h:2
 msgid "A_llow this contact to view my status"
 msgstr "Дозво_ли овом контакту да види мој статус"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Додај нови контакт"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -631,7 +467,7 @@ msgstr ""
 "протокола. Кликните на дугме за регистрацију\n"
 "за наставак."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -639,408 +475,465 @@ msgstr ""
 "Морате бити повезани на транспорт да бисте могли\n"
 "додавати контакте са овог протокола."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Група:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Надимак:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Протокол:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Регистрација"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Догодила се грешка:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Одаберите команду за извршење:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ад-хок команде - Гајим"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Означите још једном"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Опис грешке"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Молимо сачекајте док се добавља листа команди..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Молимо сачекајте док се команда шаље..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Молимо сачекајте..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Овај џабер извор не излаже ниједну команду."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Опис</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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> Требало би да поново покренете Гајим да би неке измене "
 "подешавања постале примењене"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Напредна измена конфигурације"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Филтер:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Избриши поруку дана"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Брише поруку дана"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Измени листе _приватности..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Шаље поруку тренутно повезаним корисницима овог сервера"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Постави поруку дана..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Поставља поруку дана"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Прикажи _XML Конзолу"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Освежи поруку дана..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Освежава поруку дана"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Администратор"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Пошаљи серверску поруку..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr " отварање прозора/језичка са тим контактом "
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Акције</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Услови</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Звукови</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Напредне Акције"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Напредна контрола обавештавања"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Сви статуси"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Одсутан"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Запослен"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Невидљив"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Покрените команду"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Недоступан"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Један или више посебних статуса..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "На вези / Слободан за разговор"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Пуштање звукове"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Примљена порука\n"
-"Контакт отишао са везе\n"
-"Контакт променио статус\n"
-"Обојена порука на групном разговору\n"
-"Примљена порука са групног разговора\n"
-"Захтев за пренос датотеке\n"
-"Почео пренос датотеке\n"
-"Завршен пренос датотеке"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr "_Активирање управника прозора за бљескање прозора разговора у панелу"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Онемогући аутоматско отварање прозора за разговор"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Онемогући постојећи искачући прозор"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Онемогући постојећи звук за овај догађај"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Онемогући приказивање догађаја у листи контаката"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Онемогући приказивање догађаја у системској касети"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Обавести ме искачућим прозором"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Отвори прозор за разговор са корисником"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "Прикажи догађај у листи контаката"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "Прикажи догађај у системској касети"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "и ја "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "Контакти"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
-"контакт(и)\n"
-"група/е\n"
-"сви"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "за"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Унос:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Име теме:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Задњи пут измењено:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Нов догађај примљен"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Примили сте нови унос:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Блокирани контакти"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Порука:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Постави активност"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Постави активност"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Порука:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Расположење:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Измени лозинку"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Унесите поново као потврду:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Унесите нову лозинку:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Упишите Вашу нову статусну поруку</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Активност:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Расположење:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Већ постављене поруке:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Сними као већ постављену..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Прикључи се _групном разговору"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Додај на листу контаката..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Копирај џабер ИД/е-мејл адресу"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "О"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Копирај локацију везе"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Отвори састављач е-мејла"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Отвори везу у интернет прегледачу"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Започни разговор"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Пошаљи"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "Позо_ви"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Позови пријатеље!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "Сервер групног разговора"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Молимо одаберите сервер групног разговора."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1048,187 +941,185 @@ msgstr ""
 "Започећете групни разговор.\n"
 "Одаберите контакте које желите да позовете"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "Тражи његов/њен статус"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Додај посеб_но обавештење..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Придружи Open_PGP Кључ..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "И_зврши наредбу..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Измени _групе..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "Позо_ви у"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Позови контакте"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "_Уклони"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Пошаљи кориснички дефинисан статус"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Пошаљи једну _поруку..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Пошаљи _датотеку..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Постави кориснички дефинисан аватар..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Започни ра_зговор"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Укључи/искључи енкрипцију с краја на крај"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Укључи/искључи Open_PGP енкрипцију"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Додај на листу контаката..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Дозволи му/јој да види мој статус"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Блокирај"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Забрани му/јој да види мој статус"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Историјат"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Игнориши"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Управљање контактима"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Претплата"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Одблокирај"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Поништи игнрисање"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Попуните формулар."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Конфигурација собе"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Измени групе"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESession</b> инфо)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Потврди"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Листа могућности Гајима:</b>"
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Могућности"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Листа преноса активних, завршених и заустављених датотека"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Прекини пренос датотеке"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Прекини пренос означене датотеке"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../data/gui/filetransfers.ui.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Прекини пренос означене датотеке и избриши недовршену датотеку"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Почисти"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Преноси датотека"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Сакрива прозор"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Уклони пренос датотека са листе"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Уклони завршене, прекинуте и неуспеле преносе датотека из листе"
 
-#: ../data/glade/filetransfers.glade.h:10
+#: ../data/gui/filetransfers.ui.h:10
 msgid "Shows a list of file transfers between you and others"
 msgstr "Приказује листу преноса датотека између Вас и осталих"
 
-#: ../data/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1236,75 +1127,74 @@ msgstr ""
 "Ова акција уклања пренос датотеке са листе. Ако је пренос активан, прво се "
 "зауставља, па онда уклања"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Прикажи искачуће обавештење када се заврши пренос датотеке"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Настави"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Обавести ме када се заврши пренос датотеке"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Отвори садржавајућу фасциклу"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Паузирај"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "листа преноса датотека"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Боје језичака статуса разговора</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Ред налога\n"
-"Ред група\n"
-"Ред контаката\n"
-"Банер разговора"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Налог"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Подебљано"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Састављање"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Контакт"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Изглед фонта:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Персонализација Гајим тема"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Отишао"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Група"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Неактивно"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Курзив"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1312,7 +1202,7 @@ msgstr ""
 "Поруке\n"
 "вишекорисничког разговора"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1320,109 +1210,73 @@ msgstr ""
 "Усмерене поруке\n"
 "вишекорисничког разговора"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Паузирано"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Боја текст_а:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Фонт текста:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Позадина:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Промени _надимак..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Промени _тему..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Подеси _собу..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Маркирај ову со_бу"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "Уништи собу"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "Управљање собама"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "Умањи прозор на затварање"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Мо_дератор"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "_Акције присутних"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Пошаљи _датотеку"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Додај на листу контаката"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Админ"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Забрани"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Избаци"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Члан"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Власник"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Пошаљи приватну поруку"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Глас"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Направи нову објаву"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Од"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Тема"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1432,25 +1286,19 @@ msgstr ""
 "Ако планирате да радите већа уклањања, потрудите се да Гајим није покренут. "
 "Уопште, избегавакте уклањања контаката са којима тренутно разговорате."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Обриши"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Извези"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Гајим менаџер дневника историјата"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1464,404 +1312,422 @@ msgstr ""
 "Користите овај програм да обришете или извезете дневнике. Можете одабрати "
 "дневнике са леве стране и/или претражити базу испод."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Претражи базу података"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Унесите џабер ИД или име контакта\n"
-"Историјати групних разговора\n"
-"Историјат свих разговора"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Име контакта"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Групни разговори"
+
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Претрага:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Памти у дневнику историјат разговора"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Маркирај ову собу"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Преглед"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Придружи се групном разговору"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:4
+#, fuzzy
+msgid "Join this room _automatically when I connect"
 msgstr "Уђи у ову собу аутоматски када се повежем"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Надимак:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Лозинка:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Недавно:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Соба:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Маркирај ову собу"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Придружи се"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Подешавање налога"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Аутоматско повезивање"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Ако је означено, Гајим ће се придружити овом групном разговору при покретању"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Подешавање маркера"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Умањи прозор на ауто повезивање"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Испис статуса:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Сервер:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Наслов:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "PEP конфигурација сервиса"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Конфигуриши"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Карактеристике</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Подешавања</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Подешавање прокси профила"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Лозинка:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Прокси _хост:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Прокси _порт:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Кор_исти HTTP прокси"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Користи прокси пријављивање"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH адреса:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Име:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "Врс_та:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Корисничко име:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Додај овај контакт на листу (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Маркирај ову собу (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Прегледај историјат разговора (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Промени тему собе (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Промени надимак (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Позови контакте у конверзацију (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Пошаљи датотеку (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Прикажи листу смајлија (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Прикажи листу форматирања"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Прикажи мени напредних функција (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Прикажи профил контакта (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Пошаљи"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Лозинка"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Напредна измена конфигурације</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Апликације</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Акције</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Ауто статус</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Изглед разговора</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Боје линија разговора</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Обавештења стања разговора</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Услови</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Персонални</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Фонт</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Гмаил Опције</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Већ постављене статусне поруке</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Приватност</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Изглед листе контаката</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Статусне поруке</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Теме</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Средње име:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Визуална обавештења</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Напредно"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Напредно..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Стања свих разговора\n"
-"Само састављање\n"
-"Онемогућено"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Сви статуси"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Дозволи слање података о ОС-у"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Дозволи слање података о ОС-у"
+
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Омогући искачуће прозоре/обавештења када сам _одсутан/недоступан/запослен/"
 "невидљив"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Доз_воли звукове када сам заузет"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Одсутан"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Увек користи апликацију коју оперативни систем нуди"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Увек користи апликацију коју оперативни систем нуди"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Увек користи апликацију коју оперативни систем нуди"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Питај за статусну поруку при:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
 msgstr ""
-"Аутоматски препознај при сваком покретању Гајима\n"
-"Увек користи предефинисане ГНОМ апликације\n"
-"Увек користи предефинисане КДЕ апликације\n"
-"Увек користи предефинисане ХФЦЕ4 апликације\n"
-"Прилагођено"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "По_вежи се приликом покретања Гајима"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Порука разговора:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Провери по стартовању да ли је Гајим подразумевани џабер клијент"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Састављање"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Конфигурисање боје и фонта интерфејса"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Порука разговора:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Име контакта"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Кориснички"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
 msgstr ""
-"Откачена листа контаката са откаченим разговорима\n"
-"Откачена листа контаката са једним разговором\n"
-"Један прозор за све\n"
-"Откачена листа контаката са разговорима груписаном по налозима\n"
-"Откачена листа контаката са разговорима груписаном по типу"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Онемогућено"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Прикажи активности контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Прикажи додатне е-мејл детаље"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Прикажи _расположења контаката на листи"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Прикажи _песме контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Прикажи _аватаре контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Прикажи _расположења контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Прикажи статусне поруке контаката на листи"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1871,7 +1737,7 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се приказивати у "
 "прозорима разговора."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1881,7 +1747,7 @@ msgstr ""
 "са контактом. Овде можете одредити која стања разговора ће се слати другој "
 "особи."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1889,11 +1755,11 @@ msgstr ""
 "Гајим ће Вас обавестити о контактима који су се управо одјавили са искачућим "
 "прозором у доњем десном углу екрана"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Сакриј сву дугмад у прозору разговора"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1901,7 +1767,7 @@ msgstr ""
 "Ако је означена, Гајим ће дозволити другима да погледају који оперативни "
 "систем користите"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1909,14 +1775,14 @@ msgstr ""
 "Ако је означена, Гајим ће уједно укључити и информације о пошиљаоцу нових е-"
 "мејлова"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ако је означена, Гајим ће аутоматски променити статус у Одсутан када рачунар "
 "није у употреби."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1924,7 +1790,7 @@ msgstr ""
 "Ако је означена, Гајим ће променити статус у Недоступан када рачунар још "
 "дуже није у употреби"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1932,7 +1798,7 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати аватаре контаката у листи контаката и "
 "у групним разговорима"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1940,25 +1806,32 @@ msgstr ""
 "Ако је означена, Гајим ће приказивати статусне поруке контаката испод имена "
 "контакта у листи контаката и у групним разговорима"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати активности контаката у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+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/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ако је означена, Гајим ће приказивати песме контаката у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1969,7 +1842,7 @@ msgstr ""
 "поље за унос, подразумевани језик ће бити коришћен за овај контакт или "
 "групни разговор."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1978,7 +1851,7 @@ msgstr ""
 "Ако је означена, Гајим ће игнорисати све долазне догађајеКористите са "
 "опрезом, блокираће све поруке које долазе од људи ван Ваше листе контаката"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -1988,7 +1861,7 @@ msgstr ""
 "када се користи E2E енкрипција, друга страна мора да се сложи са чувањем "
 "дневника, у супротном се поруке неће памтити."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1996,7 +1869,7 @@ msgstr ""
 "Ако је означена, Гајим ће приказати поруку када се прими нови е-мејл преко "
 "GMail-амејлова"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2005,7 +1878,7 @@ msgstr ""
 "Ако је означено, Гајим ће користити статусне иконе специфичне за протокол. "
 "(нпр. контакт са МСН-а ће имати мсн иконе за своје статусе)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2013,7 +1886,7 @@ msgstr ""
 "Ако је означена, Гајим неће питати за статусну поруку. Већ постављена "
 "подразумевана порука ће бити коришћена."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2021,79 +1894,101 @@ msgstr ""
 "Ако није онемогућено, Гајим ће заменити ascii смајлије као нпр. ':)' са "
 "еквивалентним анимираним или статичним графичким смајлијима"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Уписуј у дневник шифроване сесије разговора"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Начини прозор поруке компактним"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Поде_си..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Никад\n"
-"Само за догађаје на чекању\n"
-"Увек"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Сервер"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Обавештења"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Обавести ме о контактима који се _пријаве"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Обавести ме о контактима који се _одјаве"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Обавести ме о контактима који се _одјаве"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Обавести ме о новопристиглој Гмаил е-мејл пошти"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Никад\n"
+"Само за догађаје на чекању\n"
+"Увек"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Лични догађаји"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Пуштај звукове"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
 msgstr ""
-"Искочи\n"
-"Обавести ме о томе\n"
-"Прикажи само у листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Подешавања"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Сервер:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Прикажи догађај у листи контаката"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Прикажи у системској касети:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Пријављивању"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Одјављивању"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2101,27 +1996,27 @@ msgstr ""
 "Неке поруке могу укључивати богати садржај (форматирање, боје итд.). Ако је "
 "означено, Гајим ће само приказивати сирови текст поруке."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Сортирај контакте по статусу"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Статус"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Скуп статусних икона:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Стил"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "Т_ема:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2133,7 +2028,7 @@ msgstr ""
 "$S ће бити замењено претходном статусном поруком\n"
 "$T ће бити замењено са временом одсутности"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2145,366 +2040,381 @@ msgstr ""
 "$S ће бити замењено претходном статусном поруком\n"
 "$T ће бити замењено са временом недоступности"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Користи иконе за _транспорте"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Користи системски подразумевано"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Када се прими нови догађај:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Порука грешке: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Надимак:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "Аутом_атски одсутан после:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Интернет прегледач:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Приказана обавештења о стању разговора:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Смајлији:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Прегледач датотека:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Обоји погрешно написане речи"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнориши догађаје од контаката који нису на листи"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Игнориши богато форматирани садржај у пристиглим порукама"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Записуј у дневник статусне промене контаката"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Е-мејл клијент:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "Аутоматски _недоступан након:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Отвори..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Поново учитај подразумеване боје"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "Пошаљи обавештења о стању разговора:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Статусна порука:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "URL осветљавање:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "Понашање прозора:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "у _групним разговорима"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "у _листи контаката"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "минута"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Листе приватности:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Додај / Измени правило</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Листа правила</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Листа приватности</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Активно за ову сесију"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Актовно по сваком покретању"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Сви"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Све (укључујући и претплате)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Дозволи"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Одбиј"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "Џабер ИД"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Поредак:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Листа приватности"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "све према претплати"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "све у групи"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ниједна\n"
-"обоје\n"
-"од\n"
-"за"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Обоје"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Од"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "један"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "два"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "да ми шаље поруке"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "да ми шаље упите"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "да ми пошаље статус"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "да види мој статус"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Адреса</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Аватар:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Birthday:</b>"
 msgstr "<b>Рођендан:</b>"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Град:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Фирма:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Држава:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Одсек:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>Е-мејл:</b>"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Додатна адреса:</b>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Презиме:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Пуно име</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Име:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Лична страна:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Средње име:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Име:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Надимак:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Број телефона:</b>"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Позиција:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Поштански број:</b>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Префикс:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Улога:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Покрајина:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Улица:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Суфикс:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "О"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Кликните да бисте поставили Ваш аватар"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: ГГГГ-ММ-ДД"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Личне информације"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Посао"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Шта желите да урадите?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Уклони налог само из Гајима"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Уклони налог и из Гајима и са сервера"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2512,366 +2422,332 @@ msgstr ""
 "<b>неко@домаћин.com</b> жели да <b>додате</b> неке контакте у листу "
 "контаката."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr "Тело поруке <тренутно се не користи, па је подразумевано сакривено>"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Размена ставки контаката"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_У реду"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "_Додај контакт..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "_Могућности"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Преноси да_тотека"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Често постављана питања (интернет)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Помоћ са интернета"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Профил, А_ватар"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Прикажи само _активне контакте"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Прикажи транс_порте"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Прикажи контакте који нису на вези"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "_Прикажи листу контаката"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Налози"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Акције"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Садржај"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Измени"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_ЧПП"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Помоћ"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Подешавања"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Излаз"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Пошаљи једну _поруку..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Приказ"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Молимо сачекајте док се добавља формулар претраге..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Претрага"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Додај _контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "Информације"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Претрага"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "Кре_ни"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Адреса:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Региструј се на"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Одустани"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "О"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Од:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Одговори на ову поруку"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "П_ошаљи"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Пошаљи поруку"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Пошаљи поруку и затвори прозор"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "За:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Одговор"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Пошаљи и затвори"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Одобри ауторизацију"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../data/gui/subscription_request_window.ui.h:2
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "Одобри ауторизацију контакта тако да може да види када сте на вези"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Одбиј ауторизацију тако да не може да види када сте на вези"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Захтев за претплатом"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Одбиј"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Одаберите налог са којим желите да се синхронизујете"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 msgid "Select the contacts you want to synchronise"
 msgstr "Одаберите контакте које желите да синхронизујете"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Синхронизација: одаберите контакте"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Угаси звукове"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Пошаљи _једну поруку"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Прикажи св_е догађаје на чекању"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Ста_тус"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Групни разговор"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Ауторизација:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Клијент:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Време контакта на вези:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Џабер ИД:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Статус:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Пријава:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Систем:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Коментари"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Конфигурисани аватар:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Информације контакта"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Још"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Кориснички аватар:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Фонт</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Џабер саобраћај</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Унос</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Инфо/Упит"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_ИУ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Порука"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Присутност"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Измени налог..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Локални џабер ИД:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Лично"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Џабер клијент"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Поништи одобравање"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Тренутно извршавате команду. Да ли желите да је прекинете?"
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Сервис је послао лоше податке"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Сервис је изменио идентификатор сесије."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Сервис је вратио грешку."
 
@@ -2896,7 +2772,7 @@ msgstr "Цео број"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Боја"
 
@@ -3034,84 +2910,84 @@ msgstr "Шведски"
 msgid "Chinese (Ch)"
 msgstr "Кинески (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Језик за правопис"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Веза није доступна"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваша порука не може бити послата ако нисте повезани."
 
-#: ../src/chat_control.py:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Подвучено"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Прецртано"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Фонт"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Очисти форматирање"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Стварно пошаљи датотеку?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG енкрипција омогућена"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Није на листи контаката"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Овак контакт не подржава пренос датотека."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Морате знати прави џабер ИД контакта да бисте му/јој послали датотеку."
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Нема додељеног GPG кључа"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3119,50 +2995,50 @@ msgstr ""
 "Ниједан GPG кључ није додаљен овом контакту. Не можете шифровати поруке са "
 "GPG-ом."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG енкрипција онемогућена"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Сесија ЋЕ бити памћена"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Сесија НЕЋЕ бити памћена"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "је"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "НИЈЕ"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "ће"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "НЕЋЕ"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "и пријављени"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3171,48 +3047,48 @@ msgstr ""
 "%(type)s шифровање %(status)s активан %(authenticated)s.\n"
 "Ваша сесија разговора %(logged)s бити памћена."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Успостављање сесије прекинуто"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Ова сесија је шифрована"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr "и БИЋЕ памћена"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr "и НЕЋЕ бити памћена"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 "Идентитет другог корисника није потврђен. Кликните на штит за више детаља."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E енкрипција онемогућена"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Следећа порука НИЈЕ била шифрована"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 msgid "The following message was encrypted"
 msgstr "Следећа порука је била шифрована"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Вам је управо послао поруку"
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3220,15 +3096,15 @@ msgstr ""
 "Ако затворите овај језичак, а историјат разговора није омогућен, ова порука "
 "ће бити изгубљена."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Грешка са базом података"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3237,110 +3113,120 @@ msgstr ""
 "Датотека базе података (%s) се не може читати. Покушајте да је поправите или "
 "уклоните (сав историјат порука ће бити изгубљен)."
 
-#: ../src/chat_control.py:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s је сада %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "креирам базу дневника"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "креирам базу дневника"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s је датотека, али би требала бити фасцикла"
 
-#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Гајим ће се сада завршити"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s jе фасцикла, али би требала бити датотека"
 
-#: ../src/common/check_paths.py:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "креирам фасциклу %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Измени статусне информације"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Измени статус"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Постави тип присутности и опис"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Слободан за разговор"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "На вези"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Дуже одсутан"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Не сметај"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Није на вези"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Опис присутности:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Статус се променио."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Напусти групне разговоре"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s са групног разговора у соби %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Ппридружили сте се групном разговору."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr "Одаберите групне разговоре које желите да напустите"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Групни разговори"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Напустили сте следеће групне разговоре:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Проследи непрочитане поруке"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Све непрочитане поруке су прослеђене."
 
@@ -3437,9 +3323,9 @@ msgstr ""
 "Листа (одвојена бланко знаковима) редова (налога и група) који су отворени."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "подразумевано"
 
@@ -3726,12 +3612,12 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати статусну поруку (ако није празна) за "
 "сваки контакт у листи контаката"
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 "Дефинишите позицију аватара у листи контаката. Може бити лево или десно"
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3739,7 +3625,7 @@ msgstr ""
 "Ако је истинито, Гајим ће послати упит за аватар за сваки контакт који "
 "прошлог пута није  имао аватар или је онај у меморији престар"
 
-#: ../src/common/config.py:230
+#: ../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."
@@ -3747,7 +3633,7 @@ msgstr ""
 "Ако је неистинито, више нећете видети статусну порукуу разговорима када "
 "контакт промени свој статус и/или статусну поруку."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3761,30 +3647,30 @@ msgstr ""
 "све статусне поруке. Ако је \"in_and_out\". Гајим ће приказивати само поруке "
 "типа тај и тај је ушао/изашао у/из собе."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Боја позадине контакта када тек дођу на везу."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Боја позадине контакта када тек оду са везе."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Ако је истинито, враћене поруке из историјата ће бити мањег фонта од "
 "подразумеваног."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Не приказуј аватар за сам транспорт."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Не приказуј листу контаката у системској касети."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3794,7 +3680,7 @@ msgstr ""
 "прозор бљеска (подразумевано понашање у већини менаџера прозора) при новим "
 "догађајима."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3805,7 +3691,7 @@ msgstr ""
 "у групним разговорима"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3824,31 +3710,31 @@ msgstr ""
 "'pertype' - Поруке истог типа (нпр., разговори и групни разговори) се шаљу у "
 "исти прозор."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Ако није истинито, нећете више видети аватар у прозору разговора."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Ако је истинито, притисак на тастер 'esc' затвара језичак/прозор."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Сакрива дугмад у прозорима разговора."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Сакрива банер у прозору групног разговора."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Сакрива банер у прозору разговора две особе"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Сакрива листу учесника у прозору групног разговора"
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3856,15 +3742,15 @@ msgstr ""
 "У разговору, прикажи надимак на почетку новог реда само када се не ради о "
 "истој особи која је причала и у прошлој поруци."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Увлачење при коришћењу спајања узастопних надимака."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Глатко скроловање у прозору разговора"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3872,11 +3758,11 @@ msgstr ""
 "Листа боја одвојена са \":\" које ће бити коришћене за бојење надимака у "
 "групним разговорима."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl-Tab иде на следећи језичак када нема непрочитаних језичака"
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3884,7 +3770,7 @@ msgstr ""
 "Треба ли питати за потврду стварања псеудоконтакта или не? Празна ниска "
 "значи да никада не приказујемо дијалог."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3892,7 +3778,7 @@ msgstr ""
 "Треба ли приказивати дијалог за потврду блокирања контакта? Празна ниста "
 "значи да никада не приказујемо дијалог."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3900,7 +3786,7 @@ msgstr ""
 "Треба ли приказивати дијалог за потврду прилагођеног статуса? Празна ниска "
 "значи да никада не приказујемо дијалог."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3910,7 +3796,7 @@ msgstr ""
 "налог у прозору за измену подешавања налога. БУДИТЕ ОПРЕЗНИ, када сте "
 "повезани са негативним приоритетом НЕЋЕТЕ примати никакве поруке од сервера."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3918,7 +3804,7 @@ msgstr ""
 "Ако је истинито, Гајим ће користити Гномов Keyring (ако је доступан) да "
 "ускладишти лозинке налога."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3926,7 +3812,7 @@ msgstr ""
 "Ако је истинито, Гајим ће користити КДЕ Новчаник (ако је доступан) да "
 "ускладишти лозинке налога."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3934,7 +3820,7 @@ msgstr ""
 "Ако је истинито, Гајим ће приказивати укупан број корисника и број коринсика "
 "на вези у групним редовима."
 
-#: ../src/common/config.py:263
+#: ../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"
@@ -3942,7 +3828,7 @@ msgstr ""
 "Може бити празно, 'chat' или 'normal'. Ако није празно, третира све долазне "
 "поруке као поруке постављеног типа"
 
-#: ../src/common/config.py:264
+#: ../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."
@@ -3950,7 +3836,7 @@ msgstr ""
 "Ако је истинито, Гајим ће скроловати и означити контакт који Вам је последњи "
 "послао поруку, ако прозор разговора није отворен."
 
-#: ../src/common/config.py:265
+#: ../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."
@@ -3958,11 +3844,11 @@ msgstr ""
 "Ако је истинито, Гајим ће конвертовати све карактер између $$ и $$ у слику "
 "користећи dvips у ибацити је у прозор разговора."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Време неактивности после кога се прозор за измену статуса затвара."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3970,7 +3856,7 @@ msgstr ""
 "Максимум порука које се приказују у разоговору. Најстарије линије се "
 "склањају."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3978,18 +3864,18 @@ msgstr ""
 "Ако је истинито, прозор обавештења од сервиса обавештења ће бити закачен за "
 "системску касету."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Одаберите интервал између две провере да се ништа не дешава на рачунару."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Промените вредност да промените величину Латекс формула. Више је веће."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -3997,7 +3883,7 @@ msgstr ""
 "Исправне uri шеме. Само шеме са ове листе ће бити прихваћене као \"стварне\" "
 "uri. (mailto и xmpp се обрађују засебно)"
 
-#: ../src/common/config.py:272
+#: ../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!"
@@ -4005,13 +3891,13 @@ msgstr ""
 "Питај за статусне поруке ван везе за све контакте који нису на вези када се "
 "успостави веза са налогом. УПОЗОРЕЊЕ: ово ће послати много захтева серверу!"
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Ако је True, допуњавање у групним разговорима ће бити као допуњавање у "
 "конзоли"
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4019,7 +3905,23 @@ msgstr ""
 "Када се приказује сопствени контакт. Може бити \"always\", "
 "\"when_other_resource\" or \"never\""
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4027,7 +3929,7 @@ msgstr ""
 "Приоритет ће се аутоматски променити у зависности од Вашег статуса. "
 "Приоритети су дефинсани у autopriority_* подешавањима."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4036,39 +3938,39 @@ msgstr ""
 "dnd, invisible. ПАЖЊА: ова опција се користи само ако је "
 "restore_last_status  онемогућена."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Ако је омогућено, постави последњи коришћени статус."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 "Ако је True, контакти који траже ауторизацију ће аутоматски бити прихваћени."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Ако је False, налог ће бити онемогућен и неће се приказивати у листи "
 "контаката."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Ако је онемогућено, не потписуј присуство са GPG кључем, чак иако је GPG "
 "конфигурисан."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Омогући ESessions енкрипцију за овај налог."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Да ли ће Гајим аутоматски стартовати шифровану сесију ако је могуће?"
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4076,29 +3978,36 @@ msgstr ""
 "Уређена листа (одвојена зарезима) типова конекције за пробу. Може садржати "
 "tls, ssl или plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Прикажи прозор упозорења пре коришћења стандардне SSL библиотеке."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Прикажи прозор упозорења пре слања нешифроване лозинке преко обичне везе."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Листа ssl грешака за игнорисање, одвојена размацима."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Слање белина после неактивности"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "Слање XMPP пинга после неактивности"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4107,11 +4016,11 @@ msgstr ""
 "поновно успостављање везе."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 привремено решење"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4119,15 +4028,15 @@ msgstr ""
 "Ако је означено, Гајим ће користити Вашу ИП адресу у прокси који је "
 "дифинисан у file_transfer_proxies подешавањима за пренос."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Одговор на захтев примања"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Послати захтев примања"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4135,11 +4044,16 @@ msgstr ""
 "Када се успоставља шифрована сесија, да ли Гајим треба да претпостави да "
 "желите да чувате поруке у дневнику?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Молимо Вас испуните податке за контакт кога желите додати"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Да ли је OpenPGP омогућен за овај контакт?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4147,101 +4061,101 @@ msgstr ""
 "Да ли Гајим треба аутоматски да започне шифровану везу са овим контактом "
 "када је могуће?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Језик у коме желите проверавати неисправно написане речи"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "све или размаком одвојен статус"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'да', 'не', или 'обоје'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'да', 'не' или ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Спавам"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Враћам се брзо"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Враћам се за пар минута."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Једем"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Једем, оставите поруку."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Радим."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Радим."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Телефонирам."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Напољу"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Напољу сам, уживам у животу."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Доступан сам."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Слободан сам за разговор."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Одмах се враћам."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Недоступан сам."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Не сметај."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Поздрав!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4250,97 +4164,89 @@ msgstr ""
 "muc_highlight_words, или када нека порука групног разговора садржи Ваш "
 "надимак."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук који ће се пустити када стигне нека MUC порука."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "намирнице"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "људска"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "морска"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Није могуће учитавање модула idle"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Лош хост"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Невалидна локална адреса? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информације о регистрацији за транспорт %s нису дошле на време"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Регистрација успешна"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Регистрација са агентом %s успешна"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Регистрација неуспела"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, 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:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Грешка при упису на диск"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Невидљивост није подржана"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Налог %s не подржава невидљивост."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr "Порука од неисправног џабер ИД-а, игнорисана је."
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4350,7 +4256,7 @@ msgstr ""
 "(погледајте http://trac.gajim.org/wiki/DatabaseBackup) или  уклоните (сав "
 "историјат порука ће бити изгубљен)."
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Недозвољен надимак: %s "
@@ -4358,76 +4264,76 @@ msgstr "Недозвољен надимак: %s "
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Није могуће придружити се групном разговору"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Достигнут највећи број корисника за %s"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Забрањен Вам је приступ овом групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групни разговор.%s не постоји."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Стварање групних разговора Вам није дозвољено."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Морате користити Ваш регистровани надимак у групном разговору %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Нисте у листи чланова групног разговора %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Соба групног разговора је уништена"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Можете се прикључити соби %s уместо ове"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Желео бих да те додам на моју листу контаката."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "сада сте претплаћени на %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "захтев за укидање претплате од контакта %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "сада Вам је укинута претплата од контакта %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4564,27 +4470,27 @@ msgstr "Употреба кључа не укључује потписивање
 msgid "Application verification failure"
 msgstr "Верификација апликације неуспела"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Није могуће послати поруку за %s, овај џабер ИД није исправан."
 
-#: ../src/common/connection.py:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Нити је удаљено присуство потписано, нити је кључ додељен."
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ова порука је *шифрована* (Погледајте :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4593,76 +4499,76 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Изгубљена веза са рачуном \"%s\""
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Поново се повежите ручно."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "Сервер %(name)s је лоше одговорио на захтев регистрације:: %(error)s"
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Сервер %s је понудио другачију форму за регистрацију"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Непозната SSL грешка: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Неисправан одговор"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "Транспорт %(name)s је лоше одговорио на захтев регистрације: %(error)s"
 
-#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Веза са \"%s\" није могућа"
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Проверите Вашу конекцију или покушајте касније."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Сервер је одговорио: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Веза са проксијем прекинута"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Веза са %s није могућа"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Изгубљена веза са налогом %s. Покушајте поново да се конектујете."
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Аутентичност сертификата %s може бити неисправна."
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4671,7 +4577,7 @@ msgstr ""
 "\n"
 "SSL грешка: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4680,24 +4586,24 @@ msgstr ""
 "\n"
 "Непозната SSL грешка: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Проверите Вашу конекцију или покушајте касније"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Пријављивање са \"%s\" неуспешно"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Молимо Вас да проверите Ваше корисничко име и лозинку од грешака."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Грешка приликом уклањања листа приватности"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4706,43 +4612,43 @@ msgstr ""
 "Листа приватности %s није уклоњена. Можда је активна у неком од Ваших "
 "ресурса на вези. Деактивирајте је тамо и покушајте поново."
 
-#: ../src/common/connection.py:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Послати контакти: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Послати контакти:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Није дохваћено због статуса невидљивости"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Одјава регистрације неуспела"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr "Одјава регистрације са сервером %(server)s неуспела: %(error)s"
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Посматрачи"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Преноси"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Није у листи контаката"
 
@@ -4751,37 +4657,53 @@ msgstr "Није у листи контаката"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "D-Bus могућности Гајима се не могу користити"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus не ради исправно на овом рачунару"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (познат као python-pysqlite2) недостаје. Излазим..."
+#: ../src/common/dbus_support.py:54
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: system bus not present"
+msgstr "D-Bus не ради исправно на овом рачунару"
+
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "D-Bus не ради исправно на овом рачунару"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "База података не може да се прочита."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Сервис није доступан: Гајим није покренут или је ставка подешавања "
 "remote_control неистинита"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus не постоји на овом рачунару или нема python модула."
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Линија сесије није доступна.\n"
+"Прочитајте http:/trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Линија сесије није доступна.\n"
 "Прочитајте http:/trac.gajim.org/wiki/GajimDBus"
@@ -4949,206 +4871,206 @@ msgstr "Крај недеље"
 msgid "Weekend!"
 msgstr "Викенд!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Неисправан карактер у корисничком имену."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Потребна је адреса сервера."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Неисправан карактер у имену хоста."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Неисправан карактер у ресурсу."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Заузет"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Заузет"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Недоступан"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Слободан за разговор"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Слободан за разговор"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Доступан"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Доступан"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Повезивање"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "О_дсутан"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Није на вези"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Није на вези"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Невидљив"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?контакт има статус:Непознат"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?контакт има статус:Постоје грешке"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Тренутна претплата:Ниједна"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "За"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Обоје"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Питај (за претплату):Ниједна"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Претплатите се"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Улога контакта у групном разговору:Никаква"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Модератори"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Учесници"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Учесник"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Посетилац"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Везаност контакта у групном разоговру:Никаква"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Администратор"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Члан"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "слуша конверзацију"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "ради нешто друго"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 msgid "is composing a message..."
 msgstr "пише поруку..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "пауза при писању поруке"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "је затворио/затворила прозор или језичак разговора"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5156,22 +5078,22 @@ msgstr[0] "%d порука чека"
 msgstr[1] "%d порука чекају"
 msgstr[2] "%d порука чека"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " из собе %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " од корисника %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " од %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5179,12 +5101,49 @@ msgstr[0] "%d догађај на чекању"
 msgstr[1] "%d догађаја на чекању"
 msgstr[2] "%d догађај на чекању"
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Гајим - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Конфигурација собе"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Грешка приликом извршавања \"%(command)s\": %(error)s"
@@ -5194,17 +5153,74 @@ msgstr "Грешка приликом извршавања \"%(command)s\": %(er
 msgid "%s is not a valid loglevel"
 msgstr "%s није исправан ниво логовања"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Подразумевана порука"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Величина: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "грешка: не могу отворити %s за читање"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "цијан"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "пребацујем базу дневника у индексе"
 
@@ -5841,19 +5857,19 @@ msgstr "Учи"
 msgid "Writing"
 msgstr "Пише"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Непознат извођач"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Непознат наслов"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Непознат извор"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5863,12 +5879,12 @@ msgstr ""
 "из <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:91
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Не могу да се повежем на порт %s."
 
-#: ../src/common/socks5.py:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5876,7 +5892,7 @@ msgstr ""
 "Можда већ имате покренуту инстанцу Гајима. Пренос датотека ће бити прекинут."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5945,24 +5961,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Грешка приликом додавања сервиса. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Онемогућено"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Подразумевана порука"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Омогућен"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Речник за језик %s није доступан"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5971,214 +5983,214 @@ msgstr ""
 "Морате инсталирати %s речник како бисте могли користити проверу правописа, "
 "или одаберите други језик поставком speller_language опције."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "наслов статусне поруке"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "текст статусне поруке"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Отићи са везе и повезати се одмах?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Ако желите да се све промене тренутно примене, морате да се поново повежете."
 
-#: ../src/config.py:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP није могуће користити на овом рачунару"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Непрочитани догађаји"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Прочитајте све догађаје на чекању пре уклањања налога."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Отворили сте разговор у рачуну %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Прозори свих разговора и групних разговора ће бити затворени. Желите ли да "
 "наставите?"
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Тренутно сте спојени на сервер"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "За промену имена налога, морате отићи са везе."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Да бисте променили име налога, морате прво прочитати све догађаје на чекању."
 
-#: ../src/config.py:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Име Налога Већ У Употреби"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Ово име већ користи један од Ваших налога. Молимо Вас, одаберите друго име."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Неисправно име налога"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Име налога не може бити празно."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Име налога не може да садржи белине."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Преименуј налог"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Унесите ново име за налог%s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Џабер ИД мора бити облика \"корисник@сервер\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Неисправан унос"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Ваш порт мора бити број порта."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Неуспело узимање тајних кључева"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Нема доступних OpenPGP тајних кључева."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Одабир OpenPGP Кључева"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Одаберите Ваш OpenPGP кључ"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Није доступан такав налог"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr "Морате направити Ваш налог пре измена личних информација."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Нисте повезани на сервер"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без везе са сервером, није могућа измена личних информација."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не подржава Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може да сачува Ваше личне информације."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "Да бисте онемогућили налог, морате бити раскачени."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Рачун локал већ постоји."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Молимо Вас, преименујте или уклоните пре омогућавања локалних порука."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Измени %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Региструј се на %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Листа забрана"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Листа чланова"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Листа власника"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Листа администратора"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "ЏИД"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Разлог"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Надимак"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Улога"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Забрана..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6186,11 +6198,11 @@ msgstr ""
 "<b>Кога желите забранити?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Додавање члана..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6198,11 +6210,11 @@ msgstr ""
 "<b>Кога желите да поставите чланом?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Додавање власника..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6210,11 +6222,11 @@ msgstr ""
 "<b>Кога желите да поставите за власника?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Додавање администратора..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6222,7 +6234,7 @@ msgstr ""
 "<b>Кога желите да поставите за администратора?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6238,85 +6250,113 @@ msgstr ""
 "4. домен (само се домен поклапа, као и било који корисник@домен,\n"
 "домен/ресурс, или адреса која садржи поддомен."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Уклањање рачуна %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Смајлији искључени"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Лозинка захтевана"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Унесите Вашу лозинку за рачун %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Сачувај лозинку"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Рачун \"%s\" је повезан на сервер"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Уколико га уклоните, веза ће бити изгубљена."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Веза са проксијем прекинута"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Шта желите да урадите?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Уклони налог само из Гајима"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Подразумевано"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?испис статуса:Све"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Само ући и напустити"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Нови групни разговор"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Овај маркер има неисправне податке"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Молимо обавезно испуните поља сервера и собе или уклоните овај маркер."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Карактер није дозвољен"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Неисправан сервер"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Неисправна соба"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Налог је успешно додат"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6325,32 +6365,32 @@ msgstr ""
 "Можете поставити напредна подешавања налога притиском на дугме Напредно, или "
 "касније, кликом на ставку менија Налози под менијем Уреди из главног прозора."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Ваш нови налог је успешно направљен"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Неисправно корисничко име"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Морате уписати корисничко име да бисте конфигурисали овај налог."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Молимо одредите сервер на коме желите да се региструјете."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Сертификат је већ у датотеци"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr "Сертификат је већ у датотеци %s, па није поново додат."
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6365,7 +6405,7 @@ msgstr ""
 "SSL грешка: %(error)s\n"
 "Да ли и даље желите да се повежете на овај сервер?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6376,59 +6416,59 @@ msgstr ""
 "SHA1 отисак овог сертификата:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Појавила се грешка при креирању налога"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Име налога је већ употребљено"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Већ имате налог са тим именом."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Активно"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "догађај"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Примљена Прва Порука"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Следећа Примљена Порука Фокусирана"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Следећа Примљена Порука Нефокусирана"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Контакт На Вези"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Контакт Отишао Са Везе"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Порука Послата"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Бојење Порука Са Групног Разговора"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Примљена Порука Са Групног Разговора"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Примљен Гмаил е-мејл"
 
@@ -6450,44 +6490,44 @@ msgstr ""
 "Текст испод ове линије је оно што је речено од када сте последњи пут\n"
 "обратили пажњу на овај групни разговор"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Цитат"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Акције за налог \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Прочитајте чланак на _Википедији"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Потражи у Речнику"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "УРЛ-у Веб претраге недостаје \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Претражи Веб"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Отвори као _Везу"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6496,7 +6536,7 @@ msgstr[1] "Јуче"
 msgstr[2] "Јуче"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -6600,72 +6640,72 @@ msgstr "Yahoo! адреса:"
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати на налог %s"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Молимо Вас испуните податке за контакт кога желите додати"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Неисправан кориснички ИД"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "ИД корисника не сме садржавати ресурс."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Не можете додати себе у Вашу листу контаката."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Контакт је већ у листи"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Контакт је већ у листи контаката."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ИД корисника:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "ГТК+ џабер клијент"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "ГТК+ верзија:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyГТК верзија:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Тренутни програмери:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Прошли програмери:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "ЗАХВАЛНИЦЕ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Б. Кокановић. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6678,100 +6718,100 @@ msgstr ""
 "\n"
 "Осветљавање лоше написаних речи неће бити у употреби"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Надимак садржи недозвољене карактере."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Захтев претплате на рачун %(account)s од %(jid)s"
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Захтев претплате од %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Већ сте у групном разговору %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 msgid "You can not join a group chat unless you are connected."
 msgstr "Не можете се прикључити групном разговору ако нисте повезани."
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Придружите се групном разговору преко налога %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Неисправан налог"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "Морате одабрати налог са кога желите да уђете у собу."
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Неисправан надимак"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Неисправан Џабер ИД групног разговора"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Џабер ИД групног разговора има недозвољене знаке."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Ово није групни разговор"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s није име групног разговора."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Без везе, није могуће синхронизовати контакте."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Овај налог није повезан на сервер"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Не можете се синхронизовати са налогом ако нисте повезани."
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Синхронизуј"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започни разговор са разуном %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Започни разговор"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6780,173 +6820,171 @@ msgstr ""
 "послати поруку:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Веза није доступна"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Молимо потврдите да сте спојени на \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Неисправан џабер ИД"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Није могуће разложити \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Без везе није могућа промена лозинке."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Неисправна лозинка"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Морате да унесете лозинку"
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Лозинке се не поклапају"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Лозинке уписане у оба поља морају бити идентичне."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Контакт је на вези"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Контакт је отишао са везе"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Нова Порука"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Нова Самостална Порука"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Нова Приватна Порука"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Нови Е-мејл"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Грешка при преносу датотеке"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Пренос датотеке завршен"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Пренос датотеке заустављен"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Позив на групни разговор"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Контакт променио статус"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Самостална порука користећи налог %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Самостална порука на налогу %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Самостална Порука"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Послате %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Примљене %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s пише:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Конзола за %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Конзола"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Тужан"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Измените"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Уклони"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6954,152 +6992,152 @@ msgid ""
 msgstr "<b>%s</b> жели да <b>%s</b> неке контакте у листу ваших контаката."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Додате"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Измените"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Обриши"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Џабер ИД"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Групе"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s је предложио да вас додам у листу мојих контаката."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Додај _контакт"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Уклања контакт са листе"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Листа приватности <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Редослед: %(order)s, акција: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Измени правило</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додај правило</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Листа приватности за %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Листа приватности"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Неисправно име листе"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Морате унети име за креирање листе приватности"
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Позвани сте у групни разговор"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Вас је позвао на разговор"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact Вас је позвао на групни разговор у собу %(room_jid)s"
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Да ли желите да прихватите ову позивницу?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Одаберите звук"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Звукови"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Одаберите слику"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Слике"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Кад %s постане:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавање посебног обавештења за %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Услов"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "када сам "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7110,19 +7148,19 @@ msgstr ""
 "\n"
 "Кратка Аутентикациона Ниска ове сесије је: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Већ сте потврдили идентитет овог контакта."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Идентитет контакта потврђен"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Потврдите поново..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7132,19 +7170,19 @@ msgstr ""
 "поруке или да Вам шаљу поруке, морате потврдити њихов идентитет кликајући "
 "дугме испод."
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Идентитет контакта НИЈЕ потврђен"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Потврди..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Да ли сте проверили идентитет контакта?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7158,22 +7196,22 @@ msgstr ""
 "да ли и он има исту кратку Аутентикациону ниску као ви.\n"
 "Кратка Аутентикациона Ниска ове сесије: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Да ли сте разговарали са контактом и потврдили КАН?"
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Ниједан GPG кључ није додељен контакту. Не можете му слати шифроване поруке."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7182,7 +7220,7 @@ msgstr ""
 "поруке <b>не могу</b> бити шифроване. Употребите Вашег GPG клијента да дате "
 "поверење овом кључу."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7190,52 +7228,52 @@ msgstr ""
 "GPG кључ је додељен овом контакту и Ви верујете овом кључу тако да ће поруке "
 "бити шифроване."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Остали"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Конференција"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Без успостављене везе, не можете разгледати доступне услуге"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Откривање услуга са налога %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Откривање Услуга"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Услуга не може бити нађена"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7243,95 +7281,99 @@ msgstr ""
 "На наведеној адреси нема усуга, или нема одговора. Проверите адресу и "
 "покушајте поново."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Услуге нису претраживе"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Овај тип услуге не садржи елементе за претрагу"
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Неисправано име сервера"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Претражујем %(address)s користећи налог %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Преглед"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Ова услуга не садржи елементе за претрагу"
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Изврши наредбу"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Ре_гистрација"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Скенирање %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Корисници"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Опис"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Идентификација"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Маркирај ову со_бу"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Маркер је већ постављен"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Групни разговор \"%s\" је већ маркиран."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Маркер успешно додат"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Можете управљати Вашим маркерима помоћу менија Акције из Ваше листе "
 "контаката."
 
-#: ../src/disco.py:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Претплаћен"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Чвор"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Нова објава"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Претплати се"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Укини претплату"
 
@@ -7381,7 +7423,7 @@ msgstr "Захтева python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Могућност није доступна под Виндоуз системом."
 
@@ -7547,103 +7589,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Захтева python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Банери и линкови на које се може кликнути"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-"Даје могућност да имате линкове на које се може кликнути у разговорима."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Захтева python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Захтева python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Могућност"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Датотека"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Време"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Напредак"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Име датотеке: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Величина: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Ви"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Пошаљилац: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Примаоц: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Сачувано у: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Пренос датотеке завршен"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Отвори садржавајућу фасциклу"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Пренос датотеке прекинут"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "Није могуће успоставити везу са другом страном."
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Примаоц: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Порука грешке: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Пренос датотеке заустављен"
 
@@ -7651,7 +7680,7 @@ msgstr "Пренос датотеке заустављен"
 msgid "Choose File to Send..."
 msgstr "Одаберите датотеку за слање..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Опис:"
 
@@ -7683,33 +7712,33 @@ msgstr "Опис: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s Вам жели послати датотеку:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Није могуће преписати постојећу датотеку \"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "Датотека са овим именом већ постоји и немате привилегијапреписати је."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Ова датотека већ постоји"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "У фасциклу \"%s\" није могуће писање"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Немате привилегија за писање у овој фасцикли"
 
@@ -7745,71 +7774,56 @@ msgstr "Датотека: "
 msgid "It is not possible to send empty files"
 msgstr "Није могуће послати празну датотеку"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Пошаљилац: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Настави"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Гајиму треба X сервер да би се покренуо. Завршавам..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "неуспело увожење PyGTK модула: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Гајиму треба pyGTK 2.12 или већа верзија"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Гајиму треба pyGTK 2.12 или већа верзија. Завршавам..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Гајиму треба GTK 2.12 или већа верзија"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Гајиму треба GTK 2.12 или већа верзија. Завршавам..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "ГТК+ нема подршку за libglade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Молимо уклоните Ваш тренутни ГТК+ и инсталирајте последњу стабилну верзију "
-"са %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Молимо проверите да ГТК+ и PyГТК имају подршку за libglade на Вашем систему"
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Гајиму треба PySQLite2 за покретање"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Гајиму треба pywin32 за покретање"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7819,11 +7833,11 @@ msgstr ""
 "наћи на %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Гајим је већ покренут"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7866,8 +7880,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "налог"
 
@@ -7889,14 +7903,17 @@ msgid "status"
 msgstr "статус"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "једно од: није на вези, на вези, прича, одсутан, продужено одсутан, не "
 "узнемиравај, невидљив"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "порука"
 
@@ -8128,70 +8145,89 @@ 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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Управља xmpp:/ uri-јем"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI за управљање"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr "Налог у коме желите да управљате њиме"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Садржај поруке"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Придружи се новој соби"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "соба"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Џабер ID собе:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "надимак"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Надимак за коришћење"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "лозинка"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Лозинка за улазак у собу"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr "Налог са кога желите да уђете у собу"
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Молимо проверите да ли је Гајим покренут"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Приказује или скрива ipython прозор"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Недостаје аргумент \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8200,15 +8236,15 @@ msgstr ""
 "'%s' није на Вашј листи.\n"
 "Молимо одредите налог за слање поруке."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "немате активних рачуна"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Чини се да Гајим не ради. Не можете да користите gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8217,16 +8253,16 @@ msgstr ""
 "Коришћење: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s није пронађен"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8235,7 +8271,7 @@ msgstr ""
 "Коришћење: %s наредба [аргументи]\n"
 "Наредба је једна од:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8244,7 +8280,7 @@ msgstr ""
 "Превише аргумената\n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8253,7 +8289,11 @@ msgstr ""
 "Аргумент \"%(arg)s\" није наведен. \n"
 "Укуцајте \"%(basename)s help %(command)s\" за више информација"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Лош uri"
 
@@ -8282,175 +8322,176 @@ msgstr "Не можете избрисати Вашу тренутну тему"
 msgid "Please first choose another for your current theme."
 msgstr "Молимо Вас да прво одаберете неку другу тему."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Неуспешно слање приватне поруке"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Убаци надимак"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Разговор са "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Настављени разговор"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Свима присутнима је дозвољено да виде ваш пун џабер ID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Логовање собе је омогућено"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Нова соба је направљена"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер Вам је или доделио надимак или променио постојећи"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s је избачен: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s има забрану: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s има забрану од члана %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Од сада сте познати као %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s је од сада познат као %(new_nick)s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s је избачен из собе (%(reason)s)"
 
-#: ../src/groupchat_control.py:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "везаност измењена"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "конфигурација собе се променила на \"само чланови\""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "гашење система"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Афилијација %(nick)s је постављена на %(affiliation)s"
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Улога %(nick)s је постављена на %(role)s"
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s је отишао"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s се придружио групном разговору"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 је тренутно %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Јесте ли сигурни да желите напустити групни разговор \"%s\"?"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1690
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Ако затворите овај прозор, бићете искључени са овох групног разговора."
 
-#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Не питај ме више"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Промена Теме"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Молимо одредите нову тему:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Промена надимка"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Молимо одредите нови надимак који желите да користите:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Уништавам %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8458,22 +8499,22 @@ msgstr ""
 "Управо ћете заувек уништити ову собу.\n"
 "Можете испод написати разлог:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Можете такође унети и алтернативну локацију:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Избацујем %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Можете навести разлог испод:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Забрањујем %s"
@@ -8492,60 +8533,60 @@ msgstr "Највероватније није ништа страшно, али
 msgid "_Report Bug"
 msgstr "_Пријави грешку"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Детаљи"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: није могуће отворити %s за читање"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Грешка при читању датотеке:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 msgid "Error parsing file:"
 msgstr "Грешка при учитавању датотеке"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Гајим није Ваш подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Желите ли да Вам Гајим постане подразумевани Гајим клијент?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 "Увек на стартовању проверавај да ли је Гајим подразумевани џабер клијент"
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Екстензија није подржана"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Сними слику као..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8556,58 +8597,58 @@ msgstr ""
 "регистрован од стране неког од учесника.\n"
 "Молимо одредите други надимак испод:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Увек користи надимак када постоји конфликт"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Прихватате ли овај захтев?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Прихватате ли овај захтев на налогу %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Ауторизација за %(url)s (ид: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Веза прекинута"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "грешка приликом слања %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Захтев за претплатом"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Ауторизација прихваћена"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт \"%s\" је прихватио да видите његов/њен статус."
 
-#: ../src/gui_interface.py:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" је укинуо претплату на њега"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8615,61 +8656,61 @@ msgstr ""
 "Увек ћете га/је видети као да није на вези.\n"
 "Да ли желите да га/је уклоните са листе контаката?"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Укинута претплата"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Контакт са \"%s\" се не може успоставити"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s је поставио тему на %(subject)s"
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Соба сада приказује недоступне чланове"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "соба сада не приказује недоступне чланове"
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Логовање у соби је сада омогућено"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Логовање у соби је сада онемогућено"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Соба сада више није анонимна"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Соба је сада полу анонимна"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Соба је сада потпуно анонимна"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Лозинка потребна за придруживање групном разговору %s. Унесите је."
 
-#: ../src/gui_interface.py:1137
+#: ../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"
@@ -8677,23 +8718,23 @@ msgstr ""
 "Конфигурисали сте Гајим да користи GPG агента, али не постоји GPG агент који "
 "ради или је вратио лошу фразу лозинке.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Тренутно сте повезани без OpenPGP кључа."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Ваша лозинка није тачна"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG лозинка није тачна"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG кључ није од поверења"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8701,20 +8742,21 @@ msgstr ""
 "GPG кључ који се користи за шифровање није од поверења. Да ли заиста желите "
 "да шифрујете ову поруку?"
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нови е-мејл за %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8722,7 +8764,7 @@ msgstr[0] "Имате %d нови е-мејл разговор"
 msgstr[1] "Имате %d нова е-мејл разговора"
 msgstr[2] "Имате %d нових е-мејл разговора"
 
-#: ../src/gui_interface.py:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8737,42 +8779,42 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Вам жели послати датотеку."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Удаљени контакт је прекинуо пренос"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Грешка при отварању датотеке"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно сте примили датотеку %(filename)s од контакта %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1454
+#: ../src/gui_interface.py:1479
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Пренос датотеке %(filename)s од контакта %(name)s је заустављен."
 
-#: ../src/gui_interface.py:1467
+#: ../src/gui_interface.py:1492
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно сте послали датотеку %(filename)s за контакт %(name)s"
 
 #. ft stopped
-#: ../src/gui_interface.py:1471
+#: ../src/gui_interface.py:1496
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Пренос %(filename)s за контакт %(name)s је заустављен. "
 
-#: ../src/gui_interface.py:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8781,36 +8823,36 @@ msgstr ""
 "Не могу да дешифрујем поруку од контакта %s\n"
 "Можда је промењена."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Не могу да дешифрујем поруку"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Конфликт корисничког имена"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "Молимо Вас унесите ново корисничко име за Ваш локални налог"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Пинг?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Понг! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Грешка."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Конфликт ресурса"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8818,21 +8860,22 @@ msgstr ""
 "Већ сте конектовани на овај налог са истим ресурсем. Молимо Вас, откуцајте "
 "ново име ресурса"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Вам жели послати датотеку."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Захтев за преносом датотеке"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Грешка при верификацији SSL сертификата"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8843,15 +8886,15 @@ msgstr ""
 "%(error)s\n"
 "Да ли и даље желите да се конектујете на овај сервер?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Игнориши ову грешку за овај сертификат."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Грешка SSL сертификата"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8868,23 +8911,27 @@ msgstr ""
 "\n"
 "Да ли и даље желите да се конектујете и освежите отисак овог сертификата?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Несигурна веза"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Да, заиста желим да се конектујем несигурном везом"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -8892,27 +8939,36 @@ msgstr ""
 "Управо ћете послати лозинку преко несигурне везе. Требало би да инсталирате "
 "PyOpenSSL да спречите ово. Да ли желите да наставите?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+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"
 msgstr "PEP чвор није уклоњен"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP чвор %(node)s није уклоњен: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Смајлији искључени"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Ваша тема за смајлије није нађена, па су смајлији искључени."
 
-#: ../src/gui_interface.py:2570
+#: ../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 "
@@ -8922,40 +8978,40 @@ msgstr ""
 "emoticons.py датотеке. Погледајте http://trac.gajim.org/wiki/Emoticons за "
 "више детаља."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Није могуће чување Ваших подешавања"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Лозинка неопходна"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Унесите лозинку GPG кључа %(keyid)s (налог %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG кључ истекао"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Ваш GPG кључ је истекао, бићете повезани са %s без OpenPGP-а."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Неисправна лозинка"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Молимо поново укуцајте Вашу GPG лозинку или притисните Одустани"
 
@@ -8963,44 +9019,44 @@ msgstr "Молимо поново укуцајте Вашу GPG лозинку �
 msgid "_New Group Chat"
 msgstr "_Нови групни разговор"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Желео бих Вас додати на моју листу контаката"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Није могуће пронаћи дневник историјата базе података"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Контакти"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Датум"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Надимак"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Порука"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr ""
 "Желите ли почистити базу података? (НЕ ПРЕПОРУЧУЈЕ СЕ АКО ЈЕ ГАЈИМ ПОКРЕНУТ)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9014,16 +9070,16 @@ msgstr ""
 "\n"
 "Уколико притисните Да, молимо сачекајте..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Извожење дневника историјата..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s у %(time)s каже: %(message)s\n"
 
-#: ../src/history_manager.py:579
+#: ../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] "Да ли заиста желите избрисати дневник разговора означеног контакта?"
@@ -9032,11 +9088,11 @@ msgstr[1] ""
 msgstr[2] ""
 "Да ли заиста желите избрисати дневнике разговора означених контаката?"
 
-#: ../src/history_manager.py:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Ова операција је неповратна."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Да ли заиста желите да избришете означену поруку?"
@@ -9076,35 +9132,35 @@ msgstr "Статус је тренутно: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Статус је тренутно: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Истекло време за учитавање слике"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Слика је превелика"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Затворићете неколико језичака"
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Да ли заиста желите да их све затворите?"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Разговори"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Групни разговори"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Приватни Разговори"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Поруке"
 
@@ -9116,22 +9172,22 @@ msgstr "- поруке ће бити логоване"
 msgid "- messages will not be logged"
 msgstr "- поруке неће бити логоване"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s је променио статус"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s је на вези"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s је отишао"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нова самостална порука од контакта %(nickname)s"
@@ -9156,7 +9212,7 @@ msgstr "Нова порука од %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Нова порука од %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Игнориши"
 
@@ -9164,18 +9220,18 @@ msgstr "Игнориши"
 msgid "Retrieving profile..."
 msgstr "Дохватање профила..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Датотека је празна"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Датотека не постоји"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Не могу учитати слику"
 
@@ -9207,51 +9263,51 @@ msgstr ""
 "Настала је грешка приликом објављивања Ваших личних информација, покушајте "
 "поново касније."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Спојени налози"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Ауторизација послата"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Сада ће контакт \"%s\" знати Ваш статус."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Захтев за претплатом послат"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако контакт \"%s\" прихвати овај захтев, знаћете његов/њен статус."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Ауторизација уклоњена"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Сада ће Вас контакт \"%s\" увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG није употребљив"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Повезаћете се на %s без OpenPGP кључа."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Учествујете у једном или више групних разговора"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9259,27 +9315,38 @@ msgstr ""
 "Промена Вашег статуса у Невидљив ће резултовати  одвезивањем са тих групних "
 "разговора. Јесте ли сигурни да желите ићи на невидљиво?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "десинхронизован"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Стварно затворити Гајим?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Јесте ли сигурни да желите затворити Гајим?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Увек затвори Гајим"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Прекини пренос датотеке"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Имате непрочитаних порука"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9287,16 +9354,16 @@ msgstr ""
 "Поруке ће бити доступне за читање и касније ако имате омогућен историјат и "
 "тај контакт у листи."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Морате их прочитати пре уклањања овог транспорта."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" ће бити уклоњен"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9304,11 +9371,11 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са овог "
 "транспорта."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Транспорт ће бити уклоњен"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9317,12 +9384,12 @@ msgstr ""
 "Нећете више бити у могућности да размењујете поруке са конткатима са ових "
 "транспорта: %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете блокирати контакт. Јесте ли сигурни да желите да наставите?"
 
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9331,56 +9398,56 @@ msgstr ""
 "шаље."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Преименуј контакт"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Унесите нови надимак за контакт %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Преименуј групу"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Унесите ново име за групу %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Уклони групу"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Желите ли уклонити групу %s са листе контаката?"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Уједно уклоња и све контакте из ове групе из листе контаката"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Придружи OpenPGP Кључ"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Одаберите кључ за придруживање контакту"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" ће бити уклоњен са Ваше листе контаката"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9389,11 +9456,11 @@ msgstr ""
 "особа увек видети као да нисте на вези."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Да ли желите да наставите?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9401,16 +9468,16 @@ msgstr ""
 "Уклањањем овог контакта уједно подразумевано уклањате и одобрење што значи "
 "да ће Вас та особа увек видети као да нисте на вези."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 msgid "I want this contact to know my status after removal"
 msgstr "Желим да овај контакт зна мој статус и након уклањања"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти ће бити уклоњени са Ваше листе контаката"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9420,37 +9487,38 @@ msgstr ""
 "уједно уклањате и одобрење пто значи да ће Вас те особе увек видети као да "
 "нисте на вези."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 "Контакт ће вас привремено видети као %(status)s, али само док не промените "
 "статус. Онда ће видети глобални статус."
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Нема доступних налога"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Морате креирати налог пре него што можете да разговарате са осталим "
 "контактима."
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Чување псеудоконтаката није подржано од стране Вашег сервера"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9458,13 +9526,13 @@ msgstr ""
 "Ваш сервер не подржава чување информација псеудоконтаката. Те информације "
 "неће бити сачуване при следећем повезивању."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Управо ћете направити псеудоконткат. Јесте ли сигурни да желите наставити?"
 
-#: ../src/roster_window.py:3986
+#: ../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 "
@@ -9474,11 +9542,11 @@ msgstr ""
 "Генерално, они се користе када иста особа има неколико Џабер налога или "
 "транспортних налога."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Неисправан URI датотеке:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9486,12 +9554,12 @@ msgstr[0] "Да ли желите послати ову датотеку кон�
 msgstr[1] "Да ли желите послати ове датотеке контакту %s:"
 msgstr[2] "Да ли желите послати ове датотеке контакту %s:"
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Пошаљи %s за %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Направи метаконтакте од %s и %s"
@@ -9501,126 +9569,130 @@ msgstr "Направи метаконтакте од %s и %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "користећи рачун %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "на %s налог"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "користећи %s рачун"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Управљање _маркерима..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "налога %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "за налог %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Измени статусну поруку"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Објави песму"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Објави песму"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Конфигуриши сервисе..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Увећај све"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "П_ошаљи групну поруку"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Свим корисницима"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Свим корисницима на вези"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Управљање контактима"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Измени _групе"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Пошаљи једну поруку"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Изврши наредбу..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Управљање транспортима"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Измени транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Преименуј"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Увећај"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "У_логуј се поново"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Излогуј се"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Управник историјатом"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Придруживање новом групном разговору"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Промени статусну поруку..."
 
@@ -9651,13 +9723,13 @@ msgid "Confirm these session options"
 msgstr "Потврди ове опције сесије"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Удаљени клијент жели да започне сесију са овим могућностима:\n"
 "\n"
@@ -9680,116 +9752,126 @@ msgstr ""
 "\n"
 "Наставити са сесијом?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Промени статусну поруку..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "у _листи контаката"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Сакриј овај мени"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Џабер ИД: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s овог групног разговора"
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [блокиран]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [умањен]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Статус: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Последњи статус: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " од %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "На вези"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Ван везе"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Претплата: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Песма:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Обавештење"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Скидање"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Слање"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Пренешено: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Није почео"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Заустављен"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Завршен"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?статус преноса:Паузиран"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Застој"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Пренос у току"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Овај сервис још није пружио детаљне информације"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9797,28 +9879,28 @@ msgstr ""
 "Овај сервис није могао одговорити са детаљним информацијама.\n"
 "Највероватније је застарео или у квару"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Клијент:Непознат"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?ОС:Непознат"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Време:Непознато"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "од %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Везаност:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9826,7 +9908,7 @@ msgstr ""
 "Овај контакт је заинтересован за информације о Вашем присуству, али Вас не "
 "занимају информације о његовом/њеном присуству."
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9834,13 +9916,13 @@ msgstr ""
 "Ви сте заинтересовани за информације о присуству неког контакта, али њега/њу "
 "не занима Ваше присуство"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "И Ви и Ваш контакт сте заинтересовани за информације о присуству један другог"
 
 #. None
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9848,18 +9930,373 @@ msgstr ""
 "Не интересује Вас присутност контакта, нити Ваша присутност интересује њега/"
 "њу"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чекате одговор контакта о Вашем захтеву за претплатом"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Нема захтева за претплатом на чекању."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " ресурс са приоритетом "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Прикључи се _групном разговору..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Додај контакт..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Откривање сервиса"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Изврши наредбу..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "Измени налог"
+
+#~ msgid "_Personal Events"
+#~ msgstr "Лични догађаји"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Започни разговор"
+
+#~ msgid "_Status"
+#~ msgstr "_Статус"
+
+#~ msgid "Account Modification"
+#~ msgstr "Измена налога"
+
+#~ msgid ""
+#~ "Check this so Gajim will connect in port 5223 where legacy servers are "
+#~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+#~ "default if broadcasted by the server, and with this option enabled TLS "
+#~ "will be disabled"
+#~ msgstr ""
+#~ "Означите ово да бисте се повезали на порт 5223 где се предпоставља да "
+#~ "старији сервери имају SSL  могућности. Приметите да Гајим користи "
+#~ "подразумевано TLS енкрипцију акоје сервер тражи, а са ово опцијом "
+#~ "омогућеном, TLS ће бити искључен"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Измени личне информације"
+
+#~ msgid "Hostname: "
+#~ msgstr "Име хоста"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Ако је ово означено, Гајим ће чувати лозинке у ~/.gajim/config са 'читај' "
+#~ "привилегијом само за Вас"
+
+#~ msgid "Port: "
+#~ msgstr "Порт:"
+
+#~ msgid "Proxy:"
+#~ msgstr "Прокси:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Сними :лозинку (несигурно)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Шаљи податке о живости"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Користи _SSL (застарело)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Подеси према статусу"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Избриши поруку дана"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Пошаљи серверску поруку..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Примљена порука\n"
+#~ "Контакт отишао са везе\n"
+#~ "Контакт променио статус\n"
+#~ "Обојена порука на групном разговору\n"
+#~ "Примљена порука са групног разговора\n"
+#~ "Захтев за пренос датотеке\n"
+#~ "Почео пренос датотеке\n"
+#~ "Завршен пренос датотеке"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "контакт(и)\n"
+#~ "група/е\n"
+#~ "сви"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Прикључи се _групном разговору"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Копирај џабер ИД/е-мејл адресу"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Копирај локацију везе"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Отвори састављач е-мејла"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Отвори везу у интернет прегледачу"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Започни разговор"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Ред налога\n"
+#~ "Ред група\n"
+#~ "Ред контаката\n"
+#~ "Банер разговора"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Промени _надимак..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Промени _тему..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Подеси _собу..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "Уништи собу"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Управљање собама"
+
+#~ msgid "Send _File"
+#~ msgstr "Пошаљи _датотеку"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Додај на листу контаката"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Пошаљи приватну поруку"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Унесите џабер ИД или име контакта\n"
+#~ "Историјати групних разговора\n"
+#~ "Историјат свих разговора"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Подешавање налога"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Додај овај контакт на листу (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Маркирај ову собу (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Прегледај историјат разговора (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Промени тему собе (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Промени надимак (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Позови контакте у конверзацију (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Пошаљи датотеку (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Прикажи листу смајлија (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Прикажи листу форматирања"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Прикажи мени напредних функција (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Прикажи профил контакта (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Стања свих разговора\n"
+#~ "Само састављање\n"
+#~ "Онемогућено"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Аутоматски препознај при сваком покретању Гајима\n"
+#~ "Увек користи предефинисане ГНОМ апликације\n"
+#~ "Увек користи предефинисане КДЕ апликације\n"
+#~ "Увек користи предефинисане ХФЦЕ4 апликације\n"
+#~ "Прилагођено"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Откачена листа контаката са откаченим разговорима\n"
+#~ "Откачена листа контаката са једним разговором\n"
+#~ "Један прозор за све\n"
+#~ "Откачена листа контаката са разговорима груписаном по налозима\n"
+#~ "Откачена листа контаката са разговорима груписаном по типу"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Искочи\n"
+#~ "Обавести ме о томе\n"
+#~ "Прикажи само у листи контаката"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ниједна\n"
+#~ "обоје\n"
+#~ "од\n"
+#~ "за"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "_Додај контакт..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "_Могућности"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Преноси да_тотека"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Профил, А_ватар"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Налози"
+
+#~ msgid "_Contents"
+#~ msgstr "_Садржај"
+
+#~ msgid "_FAQ"
+#~ msgstr "_ЧПП"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Подешавања"
+
+#~ msgid "_Quit"
+#~ msgstr "_Излаз"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Пошаљи једну _поруку..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Пошаљи _једну поруку"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Ста_тус"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Групни разговор"
+
+#~ msgid "Enable"
+#~ msgstr "Омогући"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Измени налог..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Лош хост"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Невалидна локална адреса? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (познат као python-pysqlite2) недостаје. Излазим..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Банери и линкови на које се може кликнути"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Даје могућност да имате линкове на које се може кликнути у разговорима."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Захтева python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "ГТК+ нема подршку за libglade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Молимо уклоните Ваш тренутни ГТК+ и инсталирајте последњу стабилну "
+#~ "верзију са %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Молимо проверите да ГТК+ и PyГТК имају подршку за libglade на Вашем "
+#~ "систему"
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Гајиму треба PySQLite2 за покретање"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Долазна порука:"
 
@@ -10081,12 +10518,6 @@ msgstr " ресурс са приоритетом "
 #~ msgid "Gajim account %s"
 #~ msgstr "Гајим налог %s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Увек користи апликацију коју оперативни систем нуди"
-
-#~ msgid "Custom"
-#~ msgstr "Кориснички"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Дуплирај Џабер ИД"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index 77d681383..29ece5660 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -20,59 +20,11 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "GTK+ Džaber klijent"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Priključi se _grupnom razgovoru..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Dodaj kontakt..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Otkrivanje servisa"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Izvrši naredbu..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "Izmeni nalog"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Otvori Gmail dolaznu poštu"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "Lični događaji"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Započni razgovor"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -82,23 +34,23 @@ msgstr ""
 "\n"
 "Molimo pričekajte..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Molimo odaberite jednu od opcija ispod:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 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/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Molimo odaberite server</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -106,57 +58,64 @@ msgstr ""
 "Dodajte ovaj sertifikat listi sertifikata kojima verujete\n"
 "SHA1 potpis sertifikata:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anon_imno prijavljivanje"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Poveži se kada pritisnem Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: čarobnjak za kreiranje naloga"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Već imam nalog koji želim da koristim"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Želim da registrujem novi nalog"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Ako je označeno, Gajim će pamtiti lozinku za ovaj nalog"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Podesi..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ništa"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prok_si:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Snimi lozinku"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Postavi moj profil pri povezivanju"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Koristi Vaše određeno ime hosta/port "
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -164,147 +123,141 @@ msgstr ""
 "Morate posedovati račun da biste se mogli povezati\n"
 "na džaber mrežu."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Napredno"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Završi"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "Ime hosta:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Džaber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Ostalo</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Lične informacije</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+msgid "<b>Proxy</b>"
+msgstr "<b>Proksi</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+msgid "A_djust to status"
+msgstr "Po_desi prema statusu"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Nalog"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Izmena naloga"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Nalozi"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Administratorske operacije"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonimno prijavljivanje"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Automatsko povezivanje kada se veza izgubi"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Po_veži se prilikom pokretanja Gajima"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "I_zmeni lozinku"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Označite ovo da biste se povezali na port 5223 gde se predpostavlja da "
-"stariji serveri imaju SSL  mogućnosti. Primetite da Gajim koristi "
-"podrazumevano TLS enkripciju akoje server traži, a sa ovo opcijom "
-"omogućenom, TLS će biti isključen"
+"Označite ovo da Vas Gajim pita pre nego što pošaljete lozinku preko "
+"nesigurne veze."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Odaberite _Ključ"
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Kliknite za izmenu lozinke Vašeg naloga"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr "Kliknite da zatražite autorizaciju svim kontaktima drugog naloga"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "Po_veži se prilikom pokretanja Gajima"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Veza"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Izmeni lične informacije"
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "E-mejl:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Ime:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Opšte"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Ime hosta"
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -312,8 +265,11 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+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:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -321,16 +277,7 @@ msgstr ""
 "Ako je ovo označeno, Gajim će slati poruke da je prisutan kako bi sprečio "
 "prekid veze zbog duge neaktivnosti"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Ako je ovo označeno, Gajim će čuvati lozinke u ~/.gajim/config sa 'čitaj' "
-"privilegijom samo za Vas"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -338,8 +285,7 @@ msgstr ""
 "Ako je ovo označeno, Gajim će se pri svakom pokretanju automatski povezati "
 "na džaber koristeći ovaj nalog"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -349,47 +295,49 @@ msgstr ""
 "padajućeg menija na dnu prozora kontakt liste) će promeniti i status ovog "
 "naloga "
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Informacije o Vama, kako su uskladištene na serveru"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 "Džaber ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Prezime:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "_Spoji naloge"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Nije odabran nijedan ključ"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Ništa"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Lične Informacije"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port:"
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_tet"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -399,22 +347,20 @@ msgstr ""
 "slučaju da su dva ili više klijenata povezana na njega; klijent sa najvećim "
 "prioritetomdobija događaje"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet će biti automatski promenjen prema Vašem statusu."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proksi:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Prei_menuj"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Resur_s:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -427,199 +373,89 @@ msgstr ""
 "Dakle, možete biti spojeni sa resursom 'Posao' ili 'Kuća', klijent sa "
 "najvišim prioritetom će dobijati obaveštenja o događajima"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Snimi :lozinku (nesigurno)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Snimi dnevnik razgovora za sve kontakte"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Šalji podatke o živosti"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Šalji podat_ke o živosti"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Sinhroniziraj status naloga sa globalnim statusom"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Sinhronizuj kontakte"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Koristi _SSL (zastarelo)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Koristi proksi za prenos datoteka"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Podesi prema statusu"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Ime:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proksi</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "Po_desi prema statusu"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Nalozi"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anonimno prijavljivanje"
-
-#: ../data/glade/accounts_window.glade.h:13
-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."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "Po_veži se prilikom pokretanja Gajima"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-mejl:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Ime:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "Ako je označeno, Gajim će uzeti lozinku od GPG agenta"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Džaber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Prezime:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "_Spoji naloge"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Prei_menuj"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Šalji podat_ke o živosti"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Sinhroni_zuj status naloga sa globalnim statusom"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Sinhronizuj kontakte"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Koristi G_PG agenta"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "K_oristi Vaše određeno ime hosta/port "
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "K_oristi svoj port:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Koristi proksi za prenos datoteka"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "Izm_eni lične informacije..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Omogući"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "Ime _hosta:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Podesi..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "Upozori pre korišćenja nesigurne veze"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "koristi HTTP_PROXY promenljiv_u okruženja"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "_Nalog:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Dodaj novi kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -631,7 +467,7 @@ msgstr ""
 "protokola. Kliknite na dugme za registraciju\n"
 "za nastavak."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -639,409 +475,466 @@ msgstr ""
 "Morate biti povezani na transport da biste mogli\n"
 "dodavati kontakte sa ovog protokola."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Grupa:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Nadimak:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokol:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registracija"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Dogodila se greška:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Odaberite komandu za izvršenje:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hok komande - Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Označite još jednom"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Opis greške"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Molimo sačekajte dok se dobavlja lista komandi..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Molimo sačekajte dok se komanda šalje..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Molimo sačekajte..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Ovaj džaber izvor ne izlaže nijednu komandu."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Opis</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Napredna izmena konfiguracije"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Izbriši poruku dana"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Briše poruku dana"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Izmeni liste _privatnosti..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Šalje poruku trenutno povezanim korisnicima ovog servera"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Postavi poruku dana..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Postavlja poruku dana"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Prikaži _XML Konzolu"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Osveži poruku dana..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Osvežava poruku dana"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Pošalji serversku poruku..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Akcije</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Uslovi</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Zvukovi</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Napredne Akcije"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Napredna kontrola obaveštavanja"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Svi statusi"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Odsutan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Zaposlen"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Nevidljiv"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Pokrenite komandu"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Nedostupan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Jedan ili više posebnih statusa..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Na vezi / Slobodan za razgovor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Puštanje zvukove"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Primljena poruka\n"
-"Kontakt otišao sa veze\n"
-"Kontakt promenio status\n"
-"Obojena poruka na grupnom razgovoru\n"
-"Primljena poruka sa grupnog razgovora\n"
-"Zahtev za prenos datoteke\n"
-"Počeo prenos datoteke\n"
-"Završen prenos datoteke"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../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/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Onemogući automatsko otvaranje prozora za razgovor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Onemogući postojeći iskačući prozor"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../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/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Onemogući prikazivanje događaja u listi kontakata"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Onemogući prikazivanje događaja u sistemskoj kaseti"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Obavesti me iskačućim prozorom"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Otvori prozor za razgovor sa korisnikom"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "Prikaži događaj u listi kontakata"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "Prikaži događaj u sistemskoj kaseti"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "i ja "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kontakt(i)\n"
-"grupa/e\n"
-"svi"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "za"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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"
 
-#: ../data/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Unos:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Ime teme:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Zadnji put izmenjeno:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Nov događaj primljen"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Primili ste novi unos:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blokirani kontakti"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Poruka:</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Postavi aktivnost"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Postavi aktivnost"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Poruka:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Raspoloženje:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Izmeni lozinku"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Unesite ponovo kao potvrdu:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Unesite novu lozinku:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../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>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Aktivnost:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Raspoloženje:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Već postavljene poruke:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Snimi kao već postavljenu..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Priključi se _grupnom razgovoru"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Dodaj na listu kontakata..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopiraj džaber ID/e-mejl adresu"
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "O"
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiraj lokaciju veze"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Otvori sastavljač e-mejla"
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Otvori vezu u internet pregledaču"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Započni razgovor"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Pošalji"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "Pozo_vi"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Pozovi prijatelje!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "Server grupnog razgovora"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Molimo odaberite server grupnog razgovora."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1049,187 +942,185 @@ msgstr ""
 "Započećete grupni razgovor.\n"
 "Odaberite kontakte koje želite da pozovete"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "Traži njegov/njen status"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Dodaj poseb_no obaveštenje..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Pridruži Open_PGP Ključ..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "I_zvrši naredbu..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Izmeni _grupe..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "Pozo_vi u"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Pozovi kontakte"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "_Ukloni"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Pošalji korisnički definisan status"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Pošalji jednu _poruku..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Pošalji _datoteku..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Postavi korisnički definisan avatar..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Započni ra_zgovor"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Uključi/isključi enkripciju s kraja na kraj"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Uključi/isključi Open_PGP enkripciju"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Dodaj na listu kontakata..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Dozvoli mu/joj da vidi moj status"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Blokiraj"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Zabrani mu/joj da vidi moj status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Istorijat"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignoriši"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Upravljanje kontaktima"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Pretplata"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Odblokiraj"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Poništi ignrisanje"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Popunite formular."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Konfiguracija sobe"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Izmeni grupe"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESession</b> info)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Potvrdi"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Lista mogućnosti Gajima:</b>"
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Mogućnosti"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Prekini prenos datoteke"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Prekini prenos označene datoteke"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "_Počisti"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Prenosi datoteka"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Sakriva prozor"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Ukloni prenos datoteka sa liste"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1237,75 +1128,74 @@ msgstr ""
 "Ova akcija uklanja prenos datoteke sa liste. Ako je prenos aktivan, prvo se "
 "zaustavlja, pa onda uklanja"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Nastavi"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Obavesti me kada se završi prenos datoteke"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Otvori sadržavajuću fasciklu"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Pauziraj"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "lista prenosa datoteka"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Boje jezičaka statusa razgovora</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Red naloga\n"
-"Red grupa\n"
-"Red kontakata\n"
-"Baner razgovora"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Nalog"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Podebljano"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Sastavljanje"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Izgled fonta:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Personalizacija Gajim tema"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Otišao"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Grupa"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Neaktivno"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Kurziv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1313,7 +1203,7 @@ msgstr ""
 "Poruke\n"
 "višekorisničkog razgovora"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1321,109 +1211,73 @@ msgstr ""
 "Usmerene poruke\n"
 "višekorisničkog razgovora"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pauzirano"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Boja tekst_a:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Font teksta:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Pozadina:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Promeni _nadimak..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Promeni _temu..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Podesi _sobu..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Markiraj ovu so_bu"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "Uništi sobu"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "Upravljanje sobama"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "Umanji prozor na zatvaranje"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "_Akcije prisutnih"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Pošalji _datoteku"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Dodaj na listu kontakata"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Zabrani"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Izbaci"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Član"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Vlasnik"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Pošalji privatnu poruku"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Glas"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Napravi novu objavu"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Od"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Tema"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1434,25 +1288,19 @@ msgstr ""
 "pokrenut. Uopšte, izbegavakte uklanjanja kontakata sa kojima trenutno "
 "razgovorate."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Obriši"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Izvezi"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim menadžer dnevnika istorijata"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1466,404 +1314,422 @@ msgstr ""
 "Koristite ovaj program da obrišete ili izvezete dnevnike. Možete odabrati "
 "dnevnike sa leve strane i/ili pretražiti bazu ispod."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Pretraži bazu podataka"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Unesite džaber ID ili ime kontakta\n"
-"Istorijati grupnih razgovora\n"
-"Istorijat svih razgovora"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Ime kontakta"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Grupni razgovori"
+
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Pretraga:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Pamti u dnevniku istorijat razgovora"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Markiraj ovu sobu"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Pregled"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Pridruži se grupnom razgovoru"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Nadimak:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Lozinka:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Nedavno:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Soba:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Markiraj ovu sobu"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Pridruži se"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Podešavanje naloga"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Automatsko povezivanje"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Podešavanje markera"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Umanji prozor na auto povezivanje"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Ispis statusa:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Naslov:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "PEP konfiguracija servisa"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Konfiguriši"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Karakteristike</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Podešavanja</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Podešavanje proksi profila"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Lozinka:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Proksi _host:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Proksi _port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Kor_isti HTTP proksi"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Koristi proksi prijavljivanje"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH adresa:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Ime:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "Vrs_ta:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Korisničko ime:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Dodaj ovaj kontakt na listu (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "_Markiraj ovu sobu (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Pregledaj istorijat razgovora (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Promeni temu sobe (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Promeni nadimak (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Pošalji datoteku (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Prikaži listu smajlija (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Prikaži listu formatiranja"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Prikaži meni naprednih funkcija (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Prikaži profil kontakta (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Pošalji"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Lozinka"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Napredna izmena konfiguracije</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Aplikacije</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Akcije</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Auto status</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Izgled razgovora</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Boje linija razgovora</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Obaveštenja stanja razgovora</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Uslovi</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Personalni</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Font</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Gmail Opcije</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Već postavljene statusne poruke</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Privatnost</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Izgled liste kontakata</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Statusne poruke</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Teme</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Srednje ime:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Vizualna obaveštenja</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Napredno"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Napredno..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Stanja svih razgovora\n"
-"Samo sastavljanje\n"
-"Onemogućeno"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Svi statusi"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Dozvoli slanje podataka o OS-u"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Dozvoli slanje podataka o OS-u"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Doz_voli zvukove kada sam zauzet"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Odsutan"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Pitaj za statusnu poruku pri:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
 msgstr ""
-"Automatski prepoznaj pri svakom pokretanju Gajima\n"
-"Uvek koristi predefinisane GNOM aplikacije\n"
-"Uvek koristi predefinisane KDE aplikacije\n"
-"Uvek koristi predefinisane HFCE4 aplikacije\n"
-"Prilagođeno"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "Po_veži se prilikom pokretanja Gajima"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Poruka razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Proveri po startovanju da li je Gajim podrazumevani džaber klijent"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Sastavljanje"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Konfigurisanje boje i fonta interfejsa"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Poruka razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Ime kontakta"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Korisnički"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
 msgstr ""
-"Otkačena lista kontakata sa otkačenim razgovorima\n"
-"Otkačena lista kontakata sa jednim razgovorom\n"
-"Jedan prozor za sve\n"
-"Otkačena lista kontakata sa razgovorima grupisanom po nalozima\n"
-"Otkačena lista kontakata sa razgovorima grupisanom po tipu"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Onemogućeno"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Prikaži aktivnosti kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Prikaži dodatne e-mejl detalje"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Prikaži _raspoloženja kontakata na listi"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Prikaži _pesme kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Prikaži _avatare kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Prikaži _raspoloženja kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Prikaži statusne poruke kontakata na listi"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1873,7 +1739,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se prikazivati u "
 "prozorima razgovora."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1883,7 +1749,7 @@ msgstr ""
 "sa kontaktom. Ovde možete odrediti koja stanja razgovora će se slati drugoj "
 "osobi."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1891,11 +1757,11 @@ msgstr ""
 "Gajim će Vas obavestiti o kontaktima koji su se upravo odjavili sa iskačućim "
 "prozorom u donjem desnom uglu ekrana"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Sakrij svu dugmad u prozoru razgovora"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1903,7 +1769,7 @@ msgstr ""
 "Ako je označena, Gajim će dozvoliti drugima da pogledaju koji operativni "
 "sistem koristite"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1911,14 +1777,14 @@ msgstr ""
 "Ako je označena, Gajim će ujedno uključiti i informacije o pošiljaocu novih "
 "e-mejlova"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Ako je označena, Gajim će automatski promeniti status u Odsutan kada računar "
 "nije u upotrebi."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1926,7 +1792,7 @@ msgstr ""
 "Ako je označena, Gajim će promeniti status u Nedostupan kada računar još "
 "duže nije u upotrebi"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1934,7 +1800,7 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati avatare kontakata u listi kontakata i "
 "u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1942,26 +1808,34 @@ msgstr ""
 "Ako je označena, Gajim će prikazivati statusne poruke kontakata ispod imena "
 "kontakta u listi kontakata i u grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Ako je označena, Gajim će prikazivati aktivnosti kontakata u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Ako je označena, Gajim će prikazivati raspoloženje kontakata u listi "
 "kontakata"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Ako je označena, Gajim će prikazivati pesme kontakata u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1972,7 +1846,7 @@ msgstr ""
 "polje za unos, podrazumevani jezik će biti korišćen za ovaj kontakt ili "
 "grupni razgovor."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1981,7 +1855,7 @@ msgstr ""
 "Ako je označena, Gajim će ignorisati sve dolazne događajeKoristite sa "
 "oprezom, blokiraće sve poruke koje dolaze od ljudi van Vaše liste kontakata"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -1991,7 +1865,7 @@ msgstr ""
 "kada se koristi E2E enkripcija, druga strana mora da se složi sa čuvanjem "
 "dnevnika, u suprotnom se poruke neće pamtiti."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -1999,7 +1873,7 @@ msgstr ""
 "Ako je označena, Gajim će prikazati poruku kada se primi novi e-mejl preko "
 "GMail-amejlova"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2008,7 +1882,7 @@ msgstr ""
 "Ako je označeno, Gajim će koristiti statusne ikone specifične za protokol. "
 "(npr. kontakt sa MSN-a će imati msn ikone za svoje statuse)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2016,7 +1890,7 @@ msgstr ""
 "Ako je označena, Gajim neće pitati za statusnu poruku. Već postavljena "
 "podrazumevana poruka će biti korišćena."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2024,79 +1898,101 @@ msgstr ""
 "Ako nije onemogućeno, Gajim će zameniti ascii smajlije kao npr. ':)' sa "
 "ekvivalentnim animiranim ili statičnim grafičkim smajlijima"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Upisuj u dnevnik šifrovane sesije razgovora"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "Načini prozor poruke kompaktnim"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Pode_si..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Nikad\n"
-"Samo za događaje na čekanju\n"
-"Uvek"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Server"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Obaveštenja"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Obavesti me o kontaktima koji se _prijave"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Obavesti me o kontaktima koji se _odjave"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Obavesti me o kontaktima koji se _odjave"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Obavesti me o novopristigloj Gmail e-mejl pošti"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Nikad\n"
+"Samo za događaje na čekanju\n"
+"Uvek"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Lični događaji"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Puštaj zvukove"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
 msgstr ""
-"Iskoči\n"
-"Obavesti me o tome\n"
-"Prikaži samo u listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Podešavanja"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Prikaži događaj u listi kontakata"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Prikaži u sistemskoj kaseti:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Prijavljivanju"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Odjavljivanju"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2104,27 +2000,27 @@ msgstr ""
 "Neke poruke mogu uključivati bogati sadržaj (formatiranje, boje itd.). Ako "
 "je označeno, Gajim će samo prikazivati sirovi tekst poruke."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Sortiraj kontakte po statusu"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Skup statusnih ikona:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2136,7 +2032,7 @@ msgstr ""
 "$S će biti zamenjeno prethodnom statusnom porukom\n"
 "$T će biti zamenjeno sa vremenom odsutnosti"
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2148,366 +2044,381 @@ msgstr ""
 "$S će biti zamenjeno prethodnom statusnom porukom\n"
 "$T će biti zamenjeno sa vremenom nedostupnosti"
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Koristi ikone za _transporte"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Koristi sistemski podrazumevano"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Kada se primi novi događaj:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Poruka greške: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Nadimak:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "Autom_atski odsutan posle:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Internet pregledač:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Prikazana obaveštenja o stanju razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Smajliji:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Pregledač datoteka:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Oboji pogrešno napisane reči"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoriši događaje od kontakata koji nisu na listi"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignoriši bogato formatirani sadržaj u pristiglim porukama"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj u dnevnik statusne promene kontakata"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_E-mejl klijent:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "Automatski _nedostupan nakon:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Otvori..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Ponovo učitaj podrazumevane boje"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "Pošalji obaveštenja o stanju razgovora:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Statusna poruka:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "URL osvetljavanje:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "Ponašanje prozora:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "u _grupnim razgovorima"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "u _listi kontakata"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minuta"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Liste privatnosti:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Dodaj / Izmeni pravilo</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Lista pravila</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Lista privatnosti</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktivno za ovu sesiju"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktovno po svakom pokretanju"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Svi"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Sve (uključujući i pretplate)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Dozvoli"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Odbij"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "Džaber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Poredak:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Lista privatnosti"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "sve prema pretplati"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "sve u grupi"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"nijedna\n"
-"oboje\n"
-"od\n"
-"za"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Oboje"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Od"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "jedan"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "dva"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "da mi šalje poruke"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "da mi šalje upite"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "da mi pošalje status"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "da vidi moj status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adresa</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Grad:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Firma:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../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/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Odsek:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Prezime:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Puno ime</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Ime:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../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>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../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/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Ime:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Nadimak:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Pozicija:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../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>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Prefiks:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Uloga:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Pokrajina:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Ulica:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Sufiks:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "O"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Kliknite da biste postavili Vaš avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../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"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Lične informacije"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Posao"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Šta želite da uradite?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Ukloni nalog samo iz Gajima"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Ukloni nalog i iz Gajima i sa servera"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "_Ukloni"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2515,366 +2426,332 @@ msgstr ""
 "<b>neko@domaćin.com</b> želi da <b>dodate</b> neke kontakte u listu "
 "kontakata."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../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/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Razmena stavki kontakata"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_U redu"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "_Dodaj kontakt..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "_Mogućnosti"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Prenosi da_toteka"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Često postavljana pitanja (internet)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Pomoć sa interneta"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil, A_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Prikaži samo _aktivne kontakte"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Prikaži trans_porte"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Prikaži kontakte koji nisu na vezi"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "_Prikaži listu kontakata"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Nalozi"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Akcije"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Sadržaj"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Izmeni"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_ČPP"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Pomoć"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Podešavanja"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "_Izlaz"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Pošalji jednu _poruku..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Prikaz"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Molimo sačekajte dok se dobavlja formular pretrage..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Pretraga"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Dodaj _kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "Informacije"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Pretraga"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "Kre_ni"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registruj se na"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Odustani"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "O"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Od:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Odgovori na ovu poruku"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "P_ošalji"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Pošalji poruku"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Pošalji poruku i zatvori prozor"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Za:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Odgovor"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Pošalji i zatvori"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Odobri autorizaciju"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "Odbij autorizaciju tako da ne može da vidi kada ste na vezi"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Zahtev za pretplatom"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Odbij"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Odaberite nalog sa kojim želite da se sinhronizujete"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Sinhronizacija: odaberite kontakte"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Ugasi zvukove"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Pošalji _jednu poruku"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Prikaži sv_e događaje na čekanju"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Grupni razgovor"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Autorizacija:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Klijent:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Vreme kontakta na vezi:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Džaber ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Resurs:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Prijava:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Sistem:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Komentari"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Konfigurisani avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Informacije kontakta"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Još"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Korisnički avatar:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Font</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Džaber saobraćaj</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML Unos</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Omogući"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Info/Upit"
 
 #. 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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IU"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Prisutnost"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Izmeni nalog..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lokalni džaber ID:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Lično"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Resurs:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "GTK+ Džaber klijent"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Poništi odobravanje"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Servis je poslao loše podatke"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Servis je izmenio identifikator sesije."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Servis je vratio grešku."
 
@@ -2899,7 +2776,7 @@ msgstr "Ceo broj"
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Boja"
 
@@ -3037,86 +2914,86 @@ msgstr "Švedski"
 msgid "Chinese (Ch)"
 msgstr "Kineski (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Jezik za pravopis"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Podvučeno"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Precrtano"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Font"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Očisti formatiranje"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Stvarno pošalji datoteku?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG enkripcija omogućena"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Nije na listi kontakata"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Ovak kontakt ne podržava prenos datoteka."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 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:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Nema dodeljenog GPG ključa"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3124,50 +3001,50 @@ msgstr ""
 "Nijedan GPG ključ nije dodaljen ovom kontaktu. Ne možete šifrovati poruke sa "
 "GPG-om."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG enkripcija onemogućena"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Sesija ĆE biti pamćena"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Sesija NEĆE biti pamćena"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "je"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "NIJE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "će"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "NEĆE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "i prijavljeni"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3176,48 +3053,48 @@ msgstr ""
 "%(type)s šifrovanje %(status)s aktivan %(authenticated)s.\n"
 "Vaša sesija razgovora %(logged)s biti pamćena."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Uspostavljanje sesije prekinuto"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Ova sesija je šifrovana"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr "i BIĆE pamćena"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr "i NEĆE biti pamćena"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 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:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E enkripcija onemogućena"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Sledeća poruka NIJE bila šifrovana"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "\"%s\" Vam je upravo poslao poruku"
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3225,15 +3102,15 @@ msgstr ""
 "Ako zatvorite ovaj jezičak, a istorijat razgovora nije omogućen, ova poruka "
 "će biti izgubljena."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Greška sa bazom podataka"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3242,110 +3119,120 @@ 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:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s je sada %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "kreiram bazu dnevnika"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "kreiram bazu dnevnika"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim će se sada završiti"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "kreiram fasciklu %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Izmeni statusne informacije"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Izmeni status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Postavi tip prisutnosti i opis"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Na vezi"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Duže odsutan"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Ne smetaj"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Nije na vezi"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Opis prisutnosti:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Status se promenio."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Napusti grupne razgovore"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s sa grupnog razgovora u sobi %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Ppridružili ste se grupnom razgovoru."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Grupni razgovori"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Napustili ste sledeće grupne razgovore:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Prosledi nepročitane poruke"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Sve nepročitane poruke su prosleđene."
 
@@ -3443,9 +3330,9 @@ msgstr ""
 "Lista (odvojena blanko znakovima) redova (naloga i grupa) koji su otvoreni."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "podrazumevano"
 
@@ -3732,12 +3619,12 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati statusnu poruku (ako nije prazna) za "
 "svaki kontakt u listi kontakata"
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 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:229
+#: ../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."
@@ -3745,7 +3632,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:230
+#: ../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."
@@ -3753,7 +3640,7 @@ msgstr ""
 "Ako je neistinito, više nećete videti statusnu porukuu razgovorima kada "
 "kontakt promeni svoj status i/ili statusnu poruku."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3767,30 +3654,30 @@ msgstr ""
 "sve statusne poruke. Ako je \"in_and_out\". Gajim će prikazivati samo poruke "
 "tipa taj i taj je ušao/izašao u/iz sobe."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Boja pozadine kontakta kada tek dođu na vezu."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Boja pozadine kontakta kada tek odu sa veze."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 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:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Ne prikazuj avatar za sam transport."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Ne prikazuj listu kontakata u sistemskoj kaseti."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3800,7 +3687,7 @@ msgstr ""
 "prozor bljeska (podrazumevano ponašanje u većini menadžera prozora) pri "
 "novim događajima."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3811,7 +3698,7 @@ msgstr ""
 "u grupnim razgovorima"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3830,31 +3717,31 @@ msgstr ""
 "'pertype' - Poruke istog tipa (npr., razgovori i grupni razgovori) se šalju "
 "u isti prozor."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 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:246
+#: ../src/common/config.py:247
 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Sakriva dugmad u prozorima razgovora."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Sakriva baner u prozoru grupnog razgovora."
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Sakriva baner u prozoru razgovora dve osobe"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Sakriva listu učesnika u prozoru grupnog razgovora"
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3862,15 +3749,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr "Uvlačenje pri korišćenju spajanja uzastopnih nadimaka."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Glatko skrolovanje u prozoru razgovora"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3878,11 +3765,11 @@ msgstr ""
 "Lista boja odvojena sa \":\" koje će biti korišćene za bojenje nadimaka u "
 "grupnim razgovorima."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3890,7 +3777,7 @@ msgstr ""
 "Treba li pitati za potvrdu stvaranja pseudokontakta ili ne? Prazna niska "
 "znači da nikada ne prikazujemo dijalog."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3898,7 +3785,7 @@ msgstr ""
 "Treba li prikazivati dijalog za potvrdu blokiranja kontakta? Prazna nista "
 "znači da nikada ne prikazujemo dijalog."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3906,7 +3793,7 @@ msgstr ""
 "Treba li prikazivati dijalog za potvrdu prilagođenog statusa? Prazna niska "
 "znači da nikada ne prikazujemo dijalog."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3916,7 +3803,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:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3924,7 +3811,7 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti Gnomov Keyring (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3932,7 +3819,7 @@ msgstr ""
 "Ako je istinito, Gajim će koristiti KDE Novčanik (ako je dostupan) da "
 "uskladišti lozinke naloga."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3940,7 +3827,7 @@ msgstr ""
 "Ako je istinito, Gajim će prikazivati ukupan broj korisnika i broj korinsika "
 "na vezi u grupnim redovima."
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
@@ -3948,7 +3835,7 @@ msgstr ""
 "Može biti prazno, 'chat' ili 'normal'. Ako nije prazno, tretira sve dolazne "
 "poruke kao poruke postavljenog tipa"
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
@@ -3956,7 +3843,7 @@ msgstr ""
 "Ako je istinito, Gajim će skrolovati i označiti kontakt koji Vam je "
 "poslednji poslao poruku, ako prozor razgovora nije otvoren."
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
@@ -3964,11 +3851,11 @@ msgstr ""
 "Ako je istinito, Gajim će konvertovati sve karakter između $$ i $$ u sliku "
 "koristeći dvips u ibaciti je u prozor razgovora."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Vreme neaktivnosti posle koga se prozor za izmenu statusa zatvara."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -3976,7 +3863,7 @@ msgstr ""
 "Maksimum poruka koje se prikazuju u razogovoru. Najstarije linije se "
 "sklanjaju."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -3984,18 +3871,18 @@ msgstr ""
 "Ako je istinito, prozor obaveštenja od servisa obaveštenja će biti zakačen "
 "za sistemsku kasetu."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Odaberite interval između dve provere da se ništa ne dešava na računaru."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr "Promenite vrednost da promenite veličinu Lateks formula. Više je veće."
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
 "uri. (mailto and xmpp are handled separately)"
@@ -4003,7 +3890,7 @@ 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:272
+#: ../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!"
@@ -4011,13 +3898,13 @@ 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:273
+#: ../src/common/config.py:274
 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:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4025,7 +3912,23 @@ msgstr ""
 "Kada se prikazuje sopstveni kontakt. Može biti \"always\", "
 "\"when_other_resource\" or \"never\""
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4033,7 +3936,7 @@ msgstr ""
 "Prioritet će se automatski promeniti u zavisnosti od Vašeg statusa. "
 "Prioriteti su definsani u autopriority_* podešavanjima."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4042,39 +3945,39 @@ msgstr ""
 "dnd, invisible. PAŽNJA: ova opcija se koristi samo ako je "
 "restore_last_status  onemogućena."
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Ako je omogućeno, postavi poslednji korišćeni status."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 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:298
+#: ../src/common/config.py:308
 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:301
+#: ../src/common/config.py:311
 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:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Omogući ESessions enkripciju za ovaj nalog."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 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:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4082,29 +3985,36 @@ msgstr ""
 "Uređena lista (odvojena zarezima) tipova konekcije za probu. Može sadržati "
 "tls, ssl ili plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 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:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Prikaži prozor upozorenja pre slanja nešifrovane lozinke preko obične veze."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Lista ssl grešaka za ignorisanje, odvojena razmacima."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Slanje belina posle neaktivnosti"
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "Slanje XMPP pinga posle neaktivnosti"
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4113,11 +4023,11 @@ msgstr ""
 "ponovno uspostavljanje veze."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 privremeno rešenje"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4125,15 +4035,15 @@ 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:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Odgovor na zahtev primanja"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Poslati zahtev primanja"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4141,11 +4051,16 @@ msgstr ""
 "Kada se uspostavlja šifrovana sesija, da li Gajim treba da pretpostavi da "
 "želite da čuvate poruke u dnevniku?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Da li je OpenPGP omogućen za ovaj kontakt?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4153,101 +4068,101 @@ msgstr ""
 "Da li Gajim treba automatski da započne šifrovanu vezu sa ovim kontaktom "
 "kada je moguće?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Jezik u kome želite proveravati neispravno napisane reči"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "sve ili razmakom odvojen status"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'da', 'ne', ili 'oboje'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'da', 'ne' ili ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Spavam"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Vraćam se brzo"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Vraćam se za par minuta."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Jedem"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Jedem, ostavite poruku."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Gledam film."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Radim."
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Radim."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Telefoniram."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Napolju"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Napolju sam, uživam u životu."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Dostupan sam."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Slobodan sam za razgovor."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Odmah se vraćam."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Nedostupan sam."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Ne smetaj."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Pozdrav!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4256,97 +4171,89 @@ msgstr ""
 "muc_highlight_words, ili kada neka poruka grupnog razgovora sadrži Vaš "
 "nadimak."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Zvuk koji će se pustiti kada stigne neka MUC poruka."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "zelena"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "namirnice"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "ljudska"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "morska"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Nije moguće učitavanje modula idle"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Loš host"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Nevalidna lokalna adresa? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Informacije o registraciji za transport %s nisu došle na vreme"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registracija uspešna"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registracija sa agentom %s uspešna"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Registracija neuspela"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, 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:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Greška pri upisu na disk"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Nevidljivost nije podržana"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Nalog %s ne podržava nevidljivost."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 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:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4356,7 +4263,7 @@ msgstr ""
 "(pogledajte http://trac.gajim.org/wiki/DatabaseBackup) ili  uklonite (sav "
 "istorijat poruka će biti izgubljen)."
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Nedozvoljen nadimak: %s "
@@ -4364,76 +4271,76 @@ msgstr "Nedozvoljen nadimak: %s "
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Nije moguće pridružiti se grupnom razgovoru"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Dostignut najveći broj korisnika za %s"
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Zabranjen Vam je pristup ovom grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Grupni razgovor.%s ne postoji."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Stvaranje grupnih razgovora Vam nije dozvoljeno."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Morate koristiti Vaš registrovani nadimak u grupnom razgovoru %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Niste u listi članova grupnog razgovora %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Soba grupnog razgovora je uništena"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Možete se priključiti sobi %s umesto ove"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Želeo bih da te dodam na moju listu kontakata."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sada ste pretplaćeni na %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "zahtev za ukidanje pretplate od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sada Vam je ukinuta pretplata od kontakta %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4571,27 +4478,27 @@ msgstr "Upotreba ključa ne uključuje potpisivanje sertifikata"
 msgid "Application verification failure"
 msgstr "Verifikacija aplikacije neuspela"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 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:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Ova poruka je *šifrovana* (Pogledajte :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4600,76 +4507,76 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Izgubljena veza sa računom \"%s\""
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Ponovo se povežite ručno."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Server %s je ponudio drugačiju formu za registraciju"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Nepoznata SSL greška: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Neispravan odgovor"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Veza sa \"%s\" nije moguća"
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Server je odgovorio: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Veza sa proksijem prekinuta"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Veza sa %s nije moguća"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, 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:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4678,7 +4585,7 @@ msgstr ""
 "\n"
 "SSL greška: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4687,24 +4594,24 @@ msgstr ""
 "\n"
 "Nepoznata SSL greška: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Proverite Vašu konekciju ili pokušajte kasnije"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Prijavljivanje sa \"%s\" neuspešno"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 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:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Greška prilikom uklanjanja lista privatnosti"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4713,43 +4620,43 @@ 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Poslati kontakti: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Poslati kontakti:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Nije dohvaćeno zbog statusa nevidljivosti"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Odjava registracije neuspela"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, 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:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Posmatrači"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Prenosi"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Nije u listi kontakata"
 
@@ -4758,37 +4665,53 @@ msgstr "Nije u listi kontakata"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus ne radi ispravno na ovom računaru"
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, 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"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Baza podataka ne može da se pročita."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Servis nije dostupan: Gajim nije pokrenut ili je stavka podešavanja "
 "remote_control neistinita"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 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."
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Linija sesije nije dostupna.\n"
+"Pročitajte http:/trac.gajim.org/wiki/GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Linija sesije nije dostupna.\n"
 "Pročitajte http:/trac.gajim.org/wiki/GajimDBus"
@@ -4956,206 +4879,206 @@ msgstr "Kraj nedelje"
 msgid "Weekend!"
 msgstr "Vikend!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Neispravan karakter u korisničkom imenu."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Potrebna je adresa servera."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Neispravan karakter u imenu hosta."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Neispravan karakter u resursu."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Zauzet"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Zauzet"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Nedostupan"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Slobodan za razgovor"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Slobodan za razgovor"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Dostupan"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Dostupan"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "O_dsutan"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Nije na vezi"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Nije na vezi"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Nevidljiv"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?kontakt ima status:Nepoznat"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?kontakt ima status:Postoje greške"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Trenutna pretplata:Nijedna"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Za"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Oboje"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Pitaj (za pretplatu):Nijedna"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Pretplatite se"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Uloga kontakta u grupnom razgovoru:Nikakva"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderatori"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Učesnici"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Učesnik"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Posjetitelji"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Posetilac"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Vezanost kontakta u grupnom razogovru:Nikakva"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Vlasnik"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administrator"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Član"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "sluša konverzaciju"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "radi nešto drugo"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "pauza pri pisanju poruke"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "je zatvorio/zatvorila prozor ili jezičak razgovora"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5163,22 +5086,22 @@ msgstr[0] "%d poruka čeka"
 msgstr[1] "%d poruka čekaju"
 msgstr[2] "%d poruka čeka"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " iz sobe %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " od korisnika %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " od %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5186,12 +5109,49 @@ 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:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Konfiguracija sobe"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+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"
@@ -5201,17 +5161,74 @@ msgstr "Greška prilikom izvršavanja \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s nije ispravan nivo logovanja"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Podrazumevana poruka"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Veličina: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "greška: ne mogu otvoriti %s za čitanje"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "prebacujem bazu dnevnika u indekse"
 
@@ -5848,19 +5865,19 @@ msgstr "Uči"
 msgid "Writing"
 msgstr "Piše"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Nepoznat izvođač"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Nepoznat naslov"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Nepoznat izvor"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5870,12 +5887,12 @@ msgstr ""
 "iz <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5883,7 +5900,7 @@ msgstr ""
 "Možda već imate pokrenutu instancu Gajima. Prenos datoteka će biti prekinut."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5952,24 +5969,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Greška prilikom dodavanja servisa. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Onemogućeno"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Podrazumevana poruka"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Omogućen"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Rečnik za jezik %s nije dostupan"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5978,214 +5991,214 @@ msgstr ""
 "Morate instalirati %s rečnik kako biste mogli koristiti proveru pravopisa, "
 "ili odaberite drugi jezik postavkom speller_language opcije."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "naslov statusne poruke"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "tekst statusne poruke"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Otići sa veze i povezati se odmah?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP nije moguće koristiti na ovom računaru"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Nepročitani događaji"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "Pročitajte sve događaje na čekanju pre uklanjanja naloga."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Otvorili ste razgovor u računu %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Trenutno ste spojeni na server"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "Za promenu imena naloga, morate otići sa veze."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Ime Naloga Već U Upotrebi"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 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:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Neispravno ime naloga"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Ime naloga ne može biti prazno."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Ime naloga ne može da sadrži beline."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Preimenuj nalog"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Unesite novo ime za nalog%s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Džaber ID mora biti oblika \"korisnik@server\"."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Neispravan unos"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Vaš port mora biti broj porta."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Neuspelo uzimanje tajnih ključeva"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Nema dostupnih OpenPGP tajnih ključeva."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Odabir OpenPGP Ključeva"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Odaberite Vaš OpenPGP ključ"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Nije dostupan takav nalog"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr "Morate napraviti Vaš nalog pre izmena ličnih informacija."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Niste povezani na server"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Vaš server ne podržava Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 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:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr "Da biste onemogućili nalog, morate biti raskačeni."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Račun lokal već postoji."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Izmeni %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registruj se na %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Lista zabrana"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Lista članova"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Lista vlasnika"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Lista administratora"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "DŽID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Razlog"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Nadimak"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Uloga"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Zabrana..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6193,11 +6206,11 @@ msgstr ""
 "<b>Koga želite zabraniti?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Dodavanje člana..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6205,11 +6218,11 @@ msgstr ""
 "<b>Koga želite da postavite članom?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Dodavanje vlasnika..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6217,11 +6230,11 @@ msgstr ""
 "<b>Koga želite da postavite za vlasnika?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Dodavanje administratora..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6229,7 +6242,7 @@ msgstr ""
 "<b>Koga želite da postavite za administratora?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6245,86 +6258,114 @@ 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:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Uklanjanje računa %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Smajliji isključeni"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Lozinka zahtevana"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Unesite Vašu lozinku za račun %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Sačuvaj lozinku"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Račun \"%s\" je povezan na server"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Ukoliko ga uklonite, veza će biti izgubljena."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Veza sa proksijem prekinuta"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Šta želite da uradite?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Ukloni nalog samo iz Gajima"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Podrazumevano"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?ispis statusa:Sve"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Samo ući i napustiti"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:None"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Novi grupni razgovor"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Ovaj marker ima neispravne podatke"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 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:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Karakter nije dozvoljen"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Neispravan server"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Neispravna soba"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Nalog je uspešno dodat"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6334,32 +6375,32 @@ msgstr ""
 "ili kasnije, klikom na stavku menija Nalozi pod menijem Uredi iz glavnog "
 "prozora."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Vaš novi nalog je uspešno napravljen"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Neispravno korisničko ime"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "Morate upisati korisničko ime da biste konfigurisali ovaj nalog."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Molimo odredite server na kome želite da se registrujete."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Sertifikat je već u datoteci"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6374,7 +6415,7 @@ msgstr ""
 "SSL greška: %(error)s\n"
 "Da li i dalje želite da se povežete na ovaj server?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6385,59 +6426,59 @@ msgstr ""
 "SHA1 otisak ovog sertifikata:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Pojavila se greška pri kreiranju naloga"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Ime naloga je već upotrebljeno"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Već imate nalog sa tim imenom."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktivno"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "događaj"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Primljena Prva Poruka"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Sledeća Primljena Poruka Fokusirana"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Sledeća Primljena Poruka Nefokusirana"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt Na Vezi"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt Otišao Sa Veze"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Poruka Poslata"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Bojenje Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Primljena Poruka Sa Grupnog Razgovora"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Primljen Gmail e-mejl"
 
@@ -6459,44 +6500,44 @@ msgstr ""
 "Tekst ispod ove linije je ono što je rečeno od kada ste poslednji put\n"
 "obratili pažnju na ovaj grupni razgovor"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Citat"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Akcije za nalog \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Pročitajte članak na _Vikipediji"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Potraži u Rečniku"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL-u Veb pretrage nedostaje \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Pretraži Veb"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Otvori kao _Vezu"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6505,7 +6546,7 @@ msgstr[1] "Juče"
 msgstr[2] "Juče"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -6609,72 +6650,72 @@ msgstr "Yahoo! adresa:"
 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Neispravan korisnički ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "ID korisnika ne sme sadržavati resurs."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Ne možete dodati sebe u Vašu listu kontakata."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakt je već u listi"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Kontakt je već u listi kontakata."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "ID korisnika:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "GTK+ džaber klijent"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ verzija:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK verzija:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Trenutni programeri:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Prošli programeri:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "ZAHVALNICE:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "B. Kokanović. <branko.kokanovic@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6687,100 +6728,100 @@ msgstr ""
 "\n"
 "Osvetljavanje loše napisanih reči neće biti u upotrebi"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Nadimak sadrži nedozvoljene karaktere."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Zahtev pretplate od %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Već ste u grupnom razgovoru %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pridružite se grupnom razgovoru preko naloga %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Neispravan nalog"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Neispravan nadimak"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Neispravan Džaber ID grupnog razgovora"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Džaber ID grupnog razgovora ima nedozvoljene znake."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Ovo nije grupni razgovor"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s nije ime grupnog razgovora."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Bez veze, nije moguće sinhronizovati kontakte."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Ovaj nalog nije povezan na server"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Sinhronizuj"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Započni razgovor sa razunom %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Započni razgovor"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6789,173 +6830,171 @@ msgstr ""
 "poslati poruku:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Veza nije dostupna"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Molimo potvrdite da ste spojeni na \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Neispravan džaber ID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Nije moguće razložiti \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Bez veze nije moguća promena lozinke."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Neispravna lozinka"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Morate da unesete lozinku"
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Lozinke se ne poklapaju"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lozinke upisane u oba polja moraju biti identične."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakt je na vezi"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt je otišao sa veze"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nova Poruka"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nova Samostalna Poruka"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Nova Privatna Poruka"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Novi E-mejl"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Greška pri prenosu datoteke"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Prenos datoteke zaustavljen"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Poziv na grupni razgovor"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakt promenio status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Samostalna poruka koristeći nalog %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Samostalna poruka na nalogu %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Samostalna Poruka"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Poslate %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Primljene %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s piše:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzola za %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML Konzola"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Tužan"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Izmenite"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "_Ukloni"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6963,152 +7002,152 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Dodate"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Izmenite"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Obriši"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Džaber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupe"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Dodaj _kontakt"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Uklanja kontakt sa liste"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Lista privatnosti <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Redosled: %(order)s, akcija: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Izmeni pravilo</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Dodaj pravilo</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Lista privatnosti za %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Lista privatnosti"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Neispravno ime liste"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Morate uneti ime za kreiranje liste privatnosti"
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Pozvani ste u grupni razgovor"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact Vas je pozvao na razgovor"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentar: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Da li želite da prihvatite ovu pozivnicu?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Odaberite zvuk"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav Zvukovi"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Odaberite sliku"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kad %s postane:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Dodavanje posebnog obaveštenja za %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Uslov"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "kada sam "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7119,19 +7158,19 @@ msgstr ""
 "\n"
 "Kratka Autentikaciona Niska ove sesije je: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Već ste potvrdili identitet ovog kontakta."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Identitet kontakta potvrđen"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Potvrdite ponovo..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7141,19 +7180,19 @@ msgstr ""
 "poruke ili da Vam šalju poruke, morate potvrditi njihov identitet klikajući "
 "dugme ispod."
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Identitet kontakta NIJE potvrđen"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Potvrdi..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Da li ste proverili identitet kontakta?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7167,23 +7206,23 @@ msgstr ""
 "da li i on ima istu kratku Autentikacionu nisku kao vi.\n"
 "Kratka Autentikaciona Niska ove sesije: <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 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:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "Nijedan GPG ključ nije dodeljen kontaktu. Ne možete mu slati šifrovane "
 "poruke."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7192,7 +7231,7 @@ msgstr ""
 "da poruke <b>ne mogu</b> biti šifrovane. Upotrebite Vašeg GPG klijenta da "
 "date poverenje ovom ključu."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7200,52 +7239,52 @@ msgstr ""
 "GPG ključ je dodeljen ovom kontaktu i Vi verujete ovom ključu tako da će "
 "poruke biti šifrovane."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Ostali"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Konferencija"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez uspostavljene veze, ne možete razgledati dostupne usluge"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Otkrivanje usluga sa naloga %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Otkrivanje Usluga"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Usluga ne može biti nađena"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7253,95 +7292,99 @@ msgstr ""
 "Na navedenoj adresi nema usuga, ili nema odgovora. Proverite adresu i "
 "pokušajte ponovo."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Usluge nisu pretražive"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Neispravano ime servera"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Pretražujem %(address)s koristeći nalog %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Pregled"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Ova usluga ne sadrži elemente za pretragu"
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Izvrši naredbu"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistracija"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Skeniranje %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Korisnici"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Opis"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Identifikacija"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Markiraj ovu so_bu"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Marker je već postavljen"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Grupni razgovor \"%s\" je već markiran."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Marker uspešno dodat"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Pretplaćen"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Čvor"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Nova objava"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Pretplati se"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Ukini pretplatu"
 
@@ -7391,7 +7434,7 @@ msgstr "Zahteva python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Mogućnost nije dostupna pod Vindouz sistemom."
 
@@ -7557,103 +7600,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Zahteva python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Baneri i linkovi na koje se može kliknuti"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-"Daje mogućnost da imate linkove na koje se može kliknuti u razgovorima."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Zahteva python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Zahteva python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Mogućnost"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Datoteka"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Vreme"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Napredak"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Vi"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Pošaljilac: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Primaoc: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sačuvano u: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Prenos datoteke završen"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Otvori sadržavajuću fasciklu"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Prenos datoteke prekinut"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Primaoc: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Poruka greške: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Prenos datoteke zaustavljen"
 
@@ -7661,7 +7691,7 @@ msgstr "Prenos datoteke zaustavljen"
 msgid "Choose File to Send..."
 msgstr "Odaberite datoteku za slanje..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Opis:"
 
@@ -7693,33 +7723,33 @@ msgstr "Opis: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s Vam želi poslati datoteku:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:860
+#: ../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 "Datoteka sa ovim imenom već postoji i nemate privilegijaprepisati je."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Ova datoteka već postoji"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, 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:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Nemate privilegija za pisanje u ovoj fascikli"
 
@@ -7755,71 +7785,56 @@ msgstr "Datoteka: "
 msgid "It is not possible to send empty files"
 msgstr "Nije moguće poslati praznu datoteku"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Ime: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Pošaljilac: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Nastavi"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajimu treba X server da bi se pokrenuo. Završavam..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "neuspelo uvoženje PyGTK modula: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajimu treba pyGTK 2.12 ili veća verzija"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajimu treba pyGTK 2.12 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajimu treba GTK 2.12 ili veća verzija"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajimu treba GTK 2.12 ili veća verzija. Završavam..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ nema podršku za libglade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Molimo uklonite Vaš trenutni GTK+ i instalirajte poslednju stabilnu verziju "
-"sa %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Molimo proverite da GTK+ i PyGTK imaju podršku za libglade na Vašem sistemu"
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajimu treba PySQLite2 za pokretanje"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajimu treba pywin32 za pokretanje"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7829,11 +7844,11 @@ msgstr ""
 "naći na %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim je već pokrenut"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7876,8 +7891,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "nalog"
 
@@ -7899,14 +7914,17 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr ""
 "jedno od: nije na vezi, na vezi, priča, odsutan, produženo odsutan, ne "
 "uznemiravaj, nevidljiv"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "poruka"
 
@@ -8138,70 +8156,89 @@ msgstr ""
 "sve naloge"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Upravlja xmpp:/ uri-jem"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI za upravljanje"
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Sadržaj poruke"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Pridruži se novoj sobi"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "soba"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Džaber ID sobe:"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "nadimak"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Nadimak za korišćenje"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "lozinka"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Lozinka za ulazak u sobu"
 
-#: ../src/gajim-remote.py:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Molimo proverite da li je Gajim pokrenut"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Prikazuje ili skriva ipython prozor"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Nedostaje argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8210,15 +8247,15 @@ msgstr ""
 "'%s' nije na Vašj listi.\n"
 "Molimo odredite nalog za slanje poruke."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "nemate aktivnih računa"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr "Čini se da Gajim ne radi. Ne možete da koristite gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8227,16 +8264,16 @@ msgstr ""
 "Korišćenje: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Argumenti:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s nije pronađen"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8245,7 +8282,7 @@ msgstr ""
 "Korišćenje: %s naredba [argumenti]\n"
 "Naredba je jedna od:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8254,7 +8291,7 @@ msgstr ""
 "Previše argumenata\n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8263,7 +8300,11 @@ msgstr ""
 "Argument \"%(arg)s\" nije naveden. \n"
 "Ukucajte \"%(basename)s help %(command)s\" za više informacija"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Loš uri"
 
@@ -8292,176 +8333,177 @@ msgstr "Ne možete izbrisati Vašu trenutnu temu"
 msgid "Please first choose another for your current theme."
 msgstr "Molimo Vas da prvo odaberete neku drugu temu."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Neuspešno slanje privatne poruke"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Ubaci nadimak"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Razgovor sa "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Nastavljeni razgovor"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Svima prisutnima je dozvoljeno da vide vaš pun džaber ID"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Logovanje sobe je omogućeno"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Nova soba je napravljena"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s je izbačen: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ima zabranu: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Od sada ste poznati kao %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "vezanost izmenjena"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "konfiguracija sobe se promenila na \"samo članovi\""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "gašenje sistema"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, 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:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s je otišao"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s se pridružio grupnom razgovoru"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 je trenutno %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "_Ne pitaj me više"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Promena Teme"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Molimo odredite novu temu:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Promena nadimka"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Molimo odredite novi nadimak koji želite da koristite:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Uništavam %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8469,22 +8511,22 @@ msgstr ""
 "Upravo ćete zauvek uništiti ovu sobu.\n"
 "Možete ispod napisati razlog:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Možete takođe uneti i alternativnu lokaciju:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Izbacujem %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Možete navesti razlog ispod:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Zabranjujem %s"
@@ -8503,60 +8545,60 @@ msgstr "Najverovatnije nije ništa strašno, ali je ipak javite programerima."
 msgid "_Report Bug"
 msgstr "_Prijavi grešku"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detalji"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Greška: nije moguće otvoriti %s za čitanje"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Greška pri čitanju datoteke:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim nije Vaš podrazumevani džaber klijent"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 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:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Ekstenzija nije podržana"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Snimi sliku kao..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8567,58 +8609,58 @@ msgstr ""
 "registrovan od strane nekog od učesnika.\n"
 "Molimo odredite drugi nadimak ispod:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Uvek koristi nadimak kada postoji konflikt"
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Prihvatate li ovaj zahtev?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Prihvatate li ovaj zahtev na nalogu %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) Autorizacija za %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Veza prekinuta"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "greška prilikom slanja %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Zahtev za pretplatom"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Autorizacija prihvaćena"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" je ukinuo pretplatu na njega"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8626,61 +8668,61 @@ 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "Ukinuta pretplata"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt sa \"%s\" se ne može uspostaviti"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, 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:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Soba sada prikazuje nedostupne članove"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "soba sada ne prikazuje nedostupne članove"
 
-#: ../src/gui_interface.py:1058
+#: ../src/gui_interface.py:1085
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 "Desila se promena u konfiguraciji sobe (napomena: ne utiče na privatnost "
 "korisnika)"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gui_interface.py:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Logovanje u sobi je sada omogućeno"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Logovanje u sobi je sada onemogućeno"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Soba sada više nije anonimna"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Soba je sada polu anonimna"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Soba je sada potpuno anonimna"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
@@ -8688,23 +8730,23 @@ msgstr ""
 "Konfigurisali ste Gajim da koristi GPG agenta, ali ne postoji GPG agent koji "
 "radi ili je vratio lošu frazu lozinke.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Trenutno ste povezani bez OpenPGP ključa."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Vaša lozinka nije tačna"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "OpenGPG lozinka nije tačna"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG ključ nije od poverenja"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8712,20 +8754,21 @@ msgstr ""
 "GPG ključ koji se koristi za šifrovanje nije od poverenja. Da li zaista "
 "želite da šifrujete ovu poruku?"
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Novi e-mejl za %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8733,7 +8776,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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8748,42 +8791,42 @@ msgstr ""
 "Tema: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Udaljeni kontakt je prekinuo prenos"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Greška pri otvaranju datoteke"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8792,36 +8835,36 @@ msgstr ""
 "Ne mogu da dešifrujem poruku od kontakta %s\n"
 "Možda je promenjena."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Ne mogu da dešifrujem poruku"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Konflikt korisničkog imena"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Greška."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Konflikt resursa"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8829,21 +8872,22 @@ msgstr ""
 "Već ste konektovani na ovaj nalog sa istim resursem. Molimo Vas, otkucajte "
 "novo ime resursa"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s Vam želi poslati datoteku."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Zahtev za prenosom datoteke"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Greška pri verifikaciji SSL sertifikata"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8854,15 +8898,15 @@ msgstr ""
 "servera:%(error)s\n"
 "Da li i dalje želite da se konektujete na ovaj server?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignoriši ovu grešku za ovaj sertifikat."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Greška SSL sertifikata"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8879,23 +8923,27 @@ msgstr ""
 "\n"
 "Da li i dalje želite da se konektujete i osvežite otisak ovog sertifikata?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Nesigurna veza"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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 nešifrovane veze. Jeste li sigurni da "
-"želite to da uradite?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Da, zaista želim da se konektujem nesigurnom vezom"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -8903,27 +8951,36 @@ 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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Upravo ćete poslati lozinku preko nešifrovane veze. Jeste li sigurni da "
+"želite to da uradite?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "PEP čvor nije uklonjen"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP čvor %(node)s nije uklonjen: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Smajliji isključeni"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 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:2570
+#: ../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 "
@@ -8933,40 +8990,40 @@ msgstr ""
 "emoticons.py datoteke. Pogledajte http://trac.gajim.org/wiki/Emoticons za "
 "više detalja."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Nije moguće čuvanje Vaših podešavanja"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Lozinka neophodna"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Unesite lozinku GPG ključa %(keyid)s (nalog %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG ključ istekao"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Vaš GPG ključ je istekao, bićete povezani sa %s bez OpenPGP-a."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Neispravna lozinka"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
 
@@ -8974,44 +9031,44 @@ msgstr "Molimo ponovo ukucajte Vašu GPG lozinku ili pritisnite Odustani"
 msgid "_New Group Chat"
 msgstr "_Novi grupni razgovor"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Želeo bih Vas dodati na moju listu kontakata"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Nije moguće pronaći dnevnik istorijata baze podataka"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontakti"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Nadimak"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Poruka"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9025,16 +9082,16 @@ msgstr ""
 "\n"
 "Ukoliko pritisnite Da, molimo sačekajte..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Izvoženje dnevnika istorijata..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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?"
@@ -9043,11 +9100,11 @@ msgstr[1] ""
 msgstr[2] ""
 "Da li zaista želite izbrisati dnevnike razgovora označenih kontakata?"
 
-#: ../src/history_manager.py:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Ova operacija je nepovratna."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9087,35 +9144,35 @@ msgstr "Status je trenutno: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status je trenutno: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Isteklo vreme za učitavanje slike"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Slika je prevelika"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Zatvorićete nekoliko jezičaka"
 
-#: ../src/message_window.py:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Razgovori"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Grupni razgovori"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Privatni Razgovori"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Poruke"
 
@@ -9127,22 +9184,22 @@ msgstr "- poruke će biti logovane"
 msgid "- messages will not be logged"
 msgstr "- poruke neće biti logovane"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s je promenio status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s je na vezi"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s je otišao"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nova samostalna poruka od kontakta %(nickname)s"
@@ -9167,7 +9224,7 @@ msgstr "Nova poruka od %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nova poruka od %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignoriši"
 
@@ -9175,18 +9232,18 @@ msgstr "Ignoriši"
 msgid "Retrieving profile..."
 msgstr "Dohvatanje profila..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Datoteka je prazna"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Datoteka ne postoji"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Ne mogu učitati sliku"
 
@@ -9218,51 +9275,51 @@ msgstr ""
 "Nastala je greška prilikom objavljivanja Vaših ličnih informacija, pokušajte "
 "ponovo kasnije."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Spojeni nalozi"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Autorizacija poslata"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Sada će kontakt \"%s\" znati Vaš status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Zahtev za pretplatom poslat"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Autorizacija uklonjena"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, 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:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG nije upotrebljiv"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, 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:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Učestvujete u jednom ili više grupnih razgovora"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9270,27 +9327,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "desinhronizovan"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Stvarno zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Jeste li sigurni da želite zatvoriti Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Uvek zatvori Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Prekini prenos datoteke"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Imate nepročitanih poruka"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9298,16 +9366,16 @@ msgstr ""
 "Poruke će biti dostupne za čitanje i kasnije ako imate omogućen istorijat i "
 "taj kontakt u listi."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Morate ih pročitati pre uklanjanja ovog transporta."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" će biti uklonjen"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9315,11 +9383,11 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovog "
 "transporta."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transport će biti uklonjen"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9328,12 +9396,12 @@ msgstr ""
 "Nećete više biti u mogućnosti da razmenjujete poruke sa kontkatima sa ovih "
 "transporta: %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 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:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9342,56 +9410,56 @@ msgstr ""
 "šalje."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Preimenuj kontakt"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Unesite novi nadimak za kontakt %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Preimenuj grupu"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Unesite novo ime za grupu %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Ukloni grupu"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Pridruži OpenPGP Ključ"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Odaberite ključ za pridruživanje kontaktu"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, 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:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9400,11 +9468,11 @@ msgstr ""
 "ta osoba uvek videti kao da niste na vezi."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Da li želite da nastavite?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9412,16 +9480,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakti će biti uklonjeni sa Vaše liste kontakata"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9431,37 +9499,38 @@ msgstr ""
 "ujedno uklanjate i odobrenje pto znači da će Vas te osobe uvek videti kao da "
 "niste na vezi."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 "Kontakt će vas privremeno videti kao %(status)s, ali samo dok ne promenite "
 "status. Onda će videti globalni status."
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Nema dostupnih naloga"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Čuvanje pseudokontakata nije podržano od strane Vašeg servera"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9469,13 +9538,13 @@ msgstr ""
 "Vaš server ne podržava čuvanje informacija pseudokontakata. Te informacije "
 "neće biti sačuvane pri sledećem povezivanju."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9485,11 +9554,11 @@ msgstr ""
 "Generalno, oni se koriste kada ista osoba ima nekoliko Džaber naloga ili "
 "transportnih naloga."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Neispravan URI datoteke:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9497,12 +9566,12 @@ msgstr[0] "Da li želite poslati ovu datoteku kontaktu %s:"
 msgstr[1] "Da li želite poslati ove datoteke kontaktu %s:"
 msgstr[2] "Da li želite poslati ove datoteke kontaktu %s:"
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Pošalji %s za %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Napravi metakontakte od %s i %s"
@@ -9512,126 +9581,130 @@ msgstr "Napravi metakontakte od %s i %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "koristeći račun %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "na %s nalog"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "koristeći %s račun"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "Upravljanje _markerima..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "naloga %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "za nalog %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Izmeni statusnu poruku"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Objavi pesmu"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Objavi pesmu"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Konfiguriši servise..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Uvećaj sve"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "P_ošalji grupnu poruku"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Svim korisnicima"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Svim korisnicima na vezi"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Upravljanje kontaktima"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Izmeni _grupe"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Pošalji jednu poruku"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Izvrši naredbu..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Upravljanje transportima"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Izmeni transport"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "_Preimenuj"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Uvećaj"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "U_loguj se ponovo"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Izloguj se"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Upravnik istorijatom"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Pridruživanje novom grupnom razgovoru"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Promeni statusnu poruku..."
 
@@ -9662,13 +9735,13 @@ msgid "Confirm these session options"
 msgstr "Potvrdi ove opcije sesije"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Udaljeni klijent želi da započne sesiju sa ovim mogućnostima:\n"
 "\n"
@@ -9691,116 +9764,126 @@ msgstr ""
 "\n"
 "Nastaviti sa sesijom?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Promeni statusnu poruku..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "u _listi kontakata"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Sakrij ovaj meni"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Džaber ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [blokiran]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [umanjen]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Poslednji status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " od %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Na vezi"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Van veze"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Pretplata: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Pesma:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Obaveštenje"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Skidanje"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Slanje"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Tip: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Prenešeno: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Nije počeo"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Zaustavljen"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Završen"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?status prenosa:Pauziran"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Zastoj"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Prenos u toku"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Ovaj servis još nije pružio detaljne informacije"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9808,28 +9891,28 @@ msgstr ""
 "Ovaj servis nije mogao odgovoriti sa detaljnim informacijama.\n"
 "Najverovatnije je zastareo ili u kvaru"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Klijent:Nepoznat"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Nepoznat"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Vreme:Nepoznato"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Vezanost:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9837,7 +9920,7 @@ msgstr ""
 "Ovaj kontakt je zainteresovan za informacije o Vašem prisustvu, ali Vas ne "
 "zanimaju informacije o njegovom/njenom prisustvu."
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9845,13 +9928,13 @@ msgstr ""
 "Vi ste zainteresovani za informacije o prisustvu nekog kontakta, ali njega/"
 "nju ne zanima Vaše prisustvo"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -9859,18 +9942,373 @@ msgstr ""
 "Ne interesuje Vas prisutnost kontakta, niti Vaša prisutnost interesuje njega/"
 "nju"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekate odgovor kontakta o Vašem zahtevu za pretplatom"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Nema zahteva za pretplatom na čekanju."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " resurs sa prioritetom "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Priključi se _grupnom razgovoru..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Dodaj kontakt..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Otkrivanje servisa"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Izvrši naredbu..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "Izmeni nalog"
+
+#~ msgid "_Personal Events"
+#~ msgstr "Lični događaji"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Započni razgovor"
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Izmena naloga"
+
+#~ 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 ""
+#~ "Označite ovo da biste se povezali na port 5223 gde se predpostavlja da "
+#~ "stariji serveri imaju SSL  mogućnosti. Primetite da Gajim koristi "
+#~ "podrazumevano TLS enkripciju akoje server traži, a sa ovo opcijom "
+#~ "omogućenom, TLS će biti isključen"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Izmeni lične informacije"
+
+#~ msgid "Hostname: "
+#~ msgstr "Ime hosta"
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Ako je ovo označeno, Gajim će čuvati lozinke u ~/.gajim/config sa 'čitaj' "
+#~ "privilegijom samo za Vas"
+
+#~ msgid "Port: "
+#~ msgstr "Port:"
+
+#~ msgid "Proxy:"
+#~ msgstr "Proksi:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Snimi :lozinku (nesigurno)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Šalji podatke o živosti"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Koristi _SSL (zastarelo)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Podesi prema statusu"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Izbriši poruku dana"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Pošalji serversku poruku..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Primljena poruka\n"
+#~ "Kontakt otišao sa veze\n"
+#~ "Kontakt promenio status\n"
+#~ "Obojena poruka na grupnom razgovoru\n"
+#~ "Primljena poruka sa grupnog razgovora\n"
+#~ "Zahtev za prenos datoteke\n"
+#~ "Počeo prenos datoteke\n"
+#~ "Završen prenos datoteke"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontakt(i)\n"
+#~ "grupa/e\n"
+#~ "svi"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Priključi se _grupnom razgovoru"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopiraj džaber ID/e-mejl adresu"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopiraj lokaciju veze"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Otvori sastavljač e-mejla"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Otvori vezu u internet pregledaču"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Započni razgovor"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Red naloga\n"
+#~ "Red grupa\n"
+#~ "Red kontakata\n"
+#~ "Baner razgovora"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Promeni _nadimak..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Promeni _temu..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Podesi _sobu..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "Uništi sobu"
+
+#~ msgid "_Manage Room"
+#~ msgstr "Upravljanje sobama"
+
+#~ msgid "Send _File"
+#~ msgstr "Pošalji _datoteku"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Dodaj na listu kontakata"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Pošalji privatnu poruku"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Unesite džaber ID ili ime kontakta\n"
+#~ "Istorijati grupnih razgovora\n"
+#~ "Istorijat svih razgovora"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Podešavanje naloga"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Dodaj ovaj kontakt na listu (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "_Markiraj ovu sobu (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Pregledaj istorijat razgovora (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Promeni temu sobe (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Promeni nadimak (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Pozovi kontakte u konverzaciju (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Pošalji datoteku (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Prikaži listu smajlija (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Prikaži listu formatiranja"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Prikaži meni naprednih funkcija (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Prikaži profil kontakta (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Stanja svih razgovora\n"
+#~ "Samo sastavljanje\n"
+#~ "Onemogućeno"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Automatski prepoznaj pri svakom pokretanju Gajima\n"
+#~ "Uvek koristi predefinisane GNOM aplikacije\n"
+#~ "Uvek koristi predefinisane KDE aplikacije\n"
+#~ "Uvek koristi predefinisane HFCE4 aplikacije\n"
+#~ "Prilagođeno"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Otkačena lista kontakata sa otkačenim razgovorima\n"
+#~ "Otkačena lista kontakata sa jednim razgovorom\n"
+#~ "Jedan prozor za sve\n"
+#~ "Otkačena lista kontakata sa razgovorima grupisanom po nalozima\n"
+#~ "Otkačena lista kontakata sa razgovorima grupisanom po tipu"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Iskoči\n"
+#~ "Obavesti me o tome\n"
+#~ "Prikaži samo u listi kontakata"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "nijedna\n"
+#~ "oboje\n"
+#~ "od\n"
+#~ "za"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "_Dodaj kontakt..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "_Mogućnosti"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Prenosi da_toteka"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil, A_vatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Nalozi"
+
+#~ msgid "_Contents"
+#~ msgstr "_Sadržaj"
+
+#~ msgid "_FAQ"
+#~ msgstr "_ČPP"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Podešavanja"
+
+#~ msgid "_Quit"
+#~ msgstr "_Izlaz"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Pošalji jednu _poruku..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Pošalji _jednu poruku"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Grupni razgovor"
+
+#~ msgid "Enable"
+#~ msgstr "Omogući"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Izmeni nalog..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Loš host"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Nevalidna lokalna adresa? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (poznat kao python-pysqlite2) nedostaje. Izlazim..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Baneri i linkovi na koje se može kliknuti"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Daje mogućnost da imate linkove na koje se može kliknuti u razgovorima."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Zahteva python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ nema podršku za libglade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Molimo uklonite Vaš trenutni GTK+ i instalirajte poslednju stabilnu "
+#~ "verziju sa %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Molimo proverite da GTK+ i PyGTK imaju podršku za libglade na Vašem "
+#~ "sistemu"
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajimu treba PySQLite2 za pokretanje"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Dolazna poruka:"
 
@@ -10093,12 +10531,6 @@ msgstr " resurs sa prioritetom "
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim nalog %s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Uvek koristi aplikaciju koju operativni sistem nudi"
-
-#~ msgid "Custom"
-#~ msgstr "Korisnički"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Dupliraj Džaber ID"
 
diff --git a/po/sv.po b/po/sv.po
index 2ddb1c622..cd791b2bf 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\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"
@@ -18,59 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "En GTK+-baserad Jabber-klient"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Gå in i _gruppchatt..."
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Lägg till kontakt..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "_Upptäck tjänster"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Kör kommando..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Redigera konto"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "_Öppna Gmail-inkorg"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Personliga händelser"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Starta chatt..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Status"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -80,23 +32,23 @@ msgstr ""
 "\n"
 "Vänta..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Välj ett av nedanstående alternativ:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Fyll i informationen för ditt befintliga konto</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Välj en server</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -104,57 +56,64 @@ msgstr ""
 "Lägg till detta certifikat till listan över pålitliga certifikat.\n"
 "SHA1-fingeravtryck för certifikatet:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Anon_ym autentisering"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "Anslut när jag trycker på Färdigställ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontoskaparen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Jag har redan ett konto som _jag vill använda"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Jag vill _registrera ett nytt konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "Om kryssad kommer Gajim att komma ihåg lösenordet för detta konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Hantera..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Ingen"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Prox_yserver:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Spara lösen_ord"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Ställ in min profil när jag ansluter"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Använd anpassat värdnamn/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -162,148 +121,142 @@ msgstr ""
 "Du behöver ha ett konto för att kunna ansluta till\n"
 "Jabber-nätverket."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "_Avancerat"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "F_ärdigställ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "_Värdnamn:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Diverse</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Personlig information</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+msgid "<b>Proxy</b>"
+msgstr "<b>Proxyserver</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+msgid "A_djust to status"
+msgstr "Justera _efter status"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "Konto"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Kontoändring"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Konton"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Administrationsåtgärder"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Anonym autentisering"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Återanslut automatiskt när anslutningen förloras"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "A_nslut vid start av Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "_Byt lösenord"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Kryssa i det här så att Gajim ansluter till port 5223 där äldre servrar "
-"förväntades ha SSL-stöd. Observera att Gajim använder TLS-kryptering som "
-"standard om servern har stöd för det, samt att med det här alternativet så "
-"kommer TLS att inaktiveras"
+"Kryssa för denna så att Gajim frågar dig innan ditt lösenord skickas över en "
+"osäker anslutning."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Välj nyc_kel..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Klicka för att byta kontots lösenord"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Klicka för att begära auktorisation till alla kontakter för annat konto"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "A_nslut vid start av Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "Anslutning"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Redigera personlig information..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "E-post:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Förnamn:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Allmänt"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Värdnamn: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -311,8 +264,12 @@ 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/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Om kryssad kommer Gajim att få lösenordet från en GPG-agent, t.ex. Seahorse"
+
+#: ../data/gui/accounts_window.ui.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -320,16 +277,7 @@ msgstr ""
 "Om kryssad kommer Gajim att skicka keep-alive-paket som förhindrar att "
 "anslutningen överstiger tidsgränsen, vilket leder till frånkoppling"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Om kryssad kommer Gajim att spara lösenordet i ~/.gajim/config med \"läs\"-"
-"rättigheter enbart för dig och din administratör"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -337,8 +285,7 @@ msgstr ""
 "Om kryssad kommer Gajim att, vid start, automatiskt ansluta till jabber med "
 "detta konto"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -348,47 +295,49 @@ msgstr ""
 "kombinationsrutan i botten av kontaktlistfönstret) att påverka statusen även "
 "för detta konto"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"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:31
 msgid "Information about you, as stored in the server"
 msgstr "Information om dig, som den är sparad på servern"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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-ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Efternamn:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Sa_mmanfoga konton"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Ingen"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Personlig information"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Port: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Priori_tet:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -398,22 +347,20 @@ msgstr ""
 "jabberservern när två eller flera klienter är anslutna till samma konto: "
 "Klienten med den högsta prioriteten får händelserna"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet kommer att ändras automatiskt beroende på din status."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Proxyserver:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Byt _namn"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Resur_s:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -427,200 +374,89 @@ msgstr ""
 "och \"Jobb\" samtidigt. Resursen med högst prioritet kommer få händelserna. "
 "(se nedan)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Spara _lösenfras (osäkert)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Spara konversations_loggar för alla kontakter"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
-msgstr "Skicka keep-alive-paket"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
+msgstr "Skicka _keep-alive-paket"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_ronisera kontostatus med global status"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Synkronisera kontakter"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Använd _SSL (äldre)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Använd proxyservrar för filöverföringar"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Justera efter status"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Namn:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Proxyserver</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "Justera _efter status"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Konton"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Anonym autentisering"
-
-#: ../data/glade/accounts_window.glade.h:13
-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."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "A_nslut vid start av Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-post:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Förnamn:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Om kryssad kommer Gajim att få lösenordet från en GPG-agent, t.ex. Seahorse"
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber-ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Efternamn:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Sa_mmanfoga konton"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Byt _namn"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Skicka _keep-alive-paket"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "Synk_ronisera kontostatus med global status"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Synkronisera kontakter"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Använd G_PG-agent"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Använd anpassa_t värdnamn/port"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Använd anpassad p_ort:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Använd proxyservrar för filöverföringar"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "R_edigera personlig information..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "_Värdnamn: "
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "_Hantera..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Port: "
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Varna innan en osäker anslutning används"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_Använd miljövariabeln HTTP__PROXY"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "Lägg till"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "Stäng"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "Ta bort"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "K_onto:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Lägg till ny kontakt"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -632,7 +468,7 @@ msgstr ""
 "här protokollet. Klicka på knappen \n"
 "Registrera för att fortsätta."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -640,412 +476,469 @@ 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/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Grupp:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Smeknamn:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "_Protokoll:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Registrera"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Ett fel har inträffat:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Välj kommando att köra:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Kontrollera en gång till"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Felbeskrivning..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Vänta under tiden kommandolistan hämtas..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Vänta under tiden kommandot skickar..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Vänta..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Denna jabber-entitet visar inga kommandon."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Beskrivning</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 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/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Avancerad konfigurationsredigerare"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Ta bort MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Tar bort dagens meddelande"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Redigera _integritetslistor..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 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/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Ange MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Ställer in dagens meddelande"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Visa _XML-konsoll"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Uppdatera MOTD..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Uppdaterar dagens meddelande"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Administratör"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Skicka servermeddelande..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../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/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Åtgärder</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Villkor</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Ljud</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Avancerade åtgärder"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Avancerad notifieringskontroll"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Alla statusar"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "Upptagen "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Kör ett kommando"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "En eller flera speciella statusar..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "Ansluten / Ledig för chatt"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Spela upp ett ljud"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Ta emot ett meddelande\n"
-"Kontakten kopplade från \n"
-"Kontakten ändrade status \n"
-"Markeringsmeddelande i gruppchatt \n"
-"Meddelande mottaget i gruppchatt \n"
-"Filöverföring begärd \n"
-"Filöverföring startad \n"
-"Filöverföring färdig"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../data/gui/advanced_notifications_window.ui.h:25
+#, fuzzy
+msgid "Receive a Message"
+msgstr "Skicka Privat Meddelande"
+
+#: ../data/gui/advanced_notifications_window.ui.h:26
 msgid "When "
 msgstr "När "
 
-#: ../data/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 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"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Inaktivera automatiskt öppning av chattfönster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Inaktivera befintligt popupfönster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../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/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Inaktivera visning av händelser i kontaktlista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Inaktivera visning av händelser i notifieringsyta"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Informera mig med ett popupfönster"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Öppna chattfönster med användare"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Visa händelse i kontaktlista"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Visa händelse i notifieringsytan"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "och jag "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../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 ""
-"kontakt(er)\n"
-"grupp(er)\n"
-"alla"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "för "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Senast ändrad:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Blockerade kontakter"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Meddelande:</b> "
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Ställ in aktivitet"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Ställ in en aktivitet"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Meddelande:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Humör:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Byt lösenord"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Ange det igen för att bekräfta:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Ange nytt lösenord:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Ange ditt nya statusmeddelande</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Aktivitet:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Humör:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Förvalda meddelanden:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Spara som förval..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Gå in i _gruppchatt"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Lägg till i kontaktlista..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Kopiera JID/e-postadress"
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Kopiera länkplats"
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Skriv e-post"
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "_Öppna länk i webbläsare"
+#. 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 "_Skicka"
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Starta chatt"
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "Bjud _in"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Bjud in vänner!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "MUC-server"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Välj en MUC-server."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1053,189 +946,187 @@ msgstr ""
 "Du är på väg att påbörja en fleranvändarchatt.\n"
 "Välj kontakterna som du vill bjuda in"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../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/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Lägg till speciell _notifiering..."
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Tilldela Open_PGP-nyckel..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "Kör kommando..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Redigera _grupper..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "Bjud _in till"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Bjud in _kontakter"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "Ta _bort"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Skicka a_npassad status"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Skicka ett _meddelande"
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Skicka _fil..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Ställ in anpassad _avatar..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Starta _chatt"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Växla användarkryptering"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Växla Open_PGP-kryptering"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Lägg till i kontaktlista..."
+
+#: ../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"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Blockera"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Förbjud henne/honom att se min status"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Historik"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ignorera"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "_Hantera kontakt"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "Byt _namn..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Prenumeration"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "A_vblockera"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "A_vignorera"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Fyll i formuläret."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Rumkonfiguration"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Redigera grupper"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(<b>ESession</b>-info)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "_Verifiera"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../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/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Funktioner"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Avbryt filöverföring"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Avbryter den markerade filöverföringen"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Rensa _upp"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Filöverföringar"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Döljer fönstret"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Ta bort filöverföring från listan."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../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/glade/filetransfers.glade.h:10
+#: ../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/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1243,75 +1134,75 @@ 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/glade/filetransfers.glade.h:12
+#: ../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"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Fortsätt"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Meddela mig när en filöverföring är färdig"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "_Öppna mapp"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "_Paus"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "filöverföringslista"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Flikfärger för chattstatus</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Kontorad\n"
-"Grupprad\n"
-"Kontaktrad\n"
-"Chattbanner"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Konto"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Fet"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+#, fuzzy
+msgid "Chat Banner"
+msgstr "Banderoll:"
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Skriver"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Kontakt"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Typsnittsstil:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajims temaanpassare"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Borta"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Grupp"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1319,7 +1210,7 @@ msgstr ""
 "MUC-\n"
 "meddelanden"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1327,109 +1218,73 @@ msgstr ""
 "MUC-dirigerade\n"
 "meddelanden"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Pausad"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Text_färg:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "Text_typsnitt:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Bakgrund:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Byt smek_namn..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Byt _ämne..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Konfigurera _rum..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Bokmärk"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Hantera rum"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Minimera vid stängning"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Skicka _fil"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Lägg till i kontaktlista"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Bannlys"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "Sparka _ut"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Ägare"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Skicka privat meddelande"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Röst"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Skapa ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Från"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Ämne"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1439,25 +1294,19 @@ msgstr ""
 "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/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Ta bort"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Exportera"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajims hanterare för historikloggar"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1471,405 +1320,421 @@ 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/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Sök i databasen"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Ange JID eller kontaktens namn\n"
-"Historik för gruppchattar\n"
-"All chatthistorik"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Kontaktnamn"
+
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Gruppchattar"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Sök:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Logga konversationshistorik"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "Bokmärk detta rum (Ctrl+B)"
+msgid "Bro_wse Rooms"
+msgstr "_Bläddra"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Gå in i gruppchatt"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../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/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Senaste:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Server:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Bokmärk detta rum (Ctrl+B)"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "_Gå in i"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Hantera konton"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Anslut automatiskt"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../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/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Hantera bokmärken"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Minimera när du gått in automatiskt"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Skriv ut status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Server:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "PEP-tjänstekonfiguration"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Konfigurera"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "Ta bort"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Egenskaper</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Inställningar</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Hantera proxyprofiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Lösen_ord:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Proxyser_ver:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Proxyserverns _port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Använd HTTP-prox_y"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Använd autentiser_ing för proxyserver"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Namn:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "_Typ:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Lägg till denna kontakt till kontaktlistan (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Bokmärk detta rum (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Bläddra i chatthistoriken (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Ändra rummets ärende (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Ändra ditt smeknamn (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Bjud in kontakter till konversationen (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Skicka en fil (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Visa en lista över känsloikoner (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Visa en lista över formateringar"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Visa en meny över avancerade funktioner (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Visa kontaktens profil (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Skicka"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Lösenfras"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Avancerad konfigurationsredigerare</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Program</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Åtgärder</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Automatisk status</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Chattutseende</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Radfärger för chatt</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Notifieringar för chattstatus</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Villkor</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Anpassad</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Typsnitt</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail-inställningar</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Förvalda statusmeddelanden</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Integritet</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Kontaktlistans utseende</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Statusmeddelanden</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Teman</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>Mellannamn:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Visuella notifieringar</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Avancerat..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Alla chattstatusar\n"
-"Endast skrivande\n"
-"Inaktiverad"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Alla statusar"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Tillåt information om _operativsystem att skickas"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Tillåt information om _operativsystem att skickas"
+
+#: ../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"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Tillåt ljud när jag är _upptagen"
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Frånvarande"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Använd alltid OS/X standardprogram"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Använd alltid OS/X standardprogram"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Använd alltid OS/X standardprogram"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Fråga efter statusmeddelande när jag:"
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
 msgstr ""
-"Detektera vid varje Gajimstart\n"
-"Använd alltid GNOMEs standardprogram\n"
-"Använd alltid KDEs standardprogram\n"
-"Använd alltid Xfces standardprogram\n"
-"Anpassa"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "A_nslut vid start av Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Chattmeddelande:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Kontrollera vid uppstart om Gajim är _standardklient för Jabber"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Skriver"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Konfigurera färger och typsnitt för gränssnittet"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Chattmeddelande:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Kontaktnamn"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Anpassad"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
 msgstr ""
-"Frikopplad kontaktlista med frikopplade chattar\n"
-"Frikopplad kontaktlista med en chatt\n"
-"Ett enda fönster för allting\n"
-"Frikopplad kontaktlista med chatt, grupperad efter konto\n"
-"Frikopplad kontaktlista med chatt, grupperad efter typ"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Avstängd"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Visa _aktivitet för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Visa _extra e-postdetaljer"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Visa _humör för kontakter i kontaktlista"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Visa _låtar för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Visa a_vatarer för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Visa _humör för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Visa status_meddelanden för kontakter i kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1879,7 +1744,7 @@ msgstr ""
 "som du har med en kontakt. Här kan du ange vilka chattstatusar som du vill "
 "visa i chattfönster."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1889,7 +1754,7 @@ msgstr ""
 "som du har med en kontakt. Här kan du ange vilka chattstatusar som du vill "
 "skicka till den andra parten."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1897,11 +1762,11 @@ msgstr ""
 "Gajim kommer att notifiera dig via ett popupfönster i nedre högra hörnet av "
 "skärmen om kontakter som just loggat ut"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Dölj alla knappar i chattfönster"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1909,7 +1774,7 @@ msgstr ""
 "Om kryssad kommer Gajim att tillåta andra att detektera operativsystemet som "
 "du använder"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1917,19 +1782,19 @@ msgstr ""
 "Om kryssad kommer Gajim även att inkludera information om avsändaren av den "
 "nya e-posten"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 #, 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/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1937,7 +1802,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa avatarer för kontakter i kontaktfönster och "
 "gruppchattar"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1945,7 +1810,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa statusmeddelanden för kontakter under "
 "kontaktens namn i kontaktfönster och gruppchattar"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
@@ -1953,7 +1818,15 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, 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"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
@@ -1961,7 +1834,7 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
@@ -1969,14 +1842,14 @@ msgstr ""
 "Om kryssad kommer Gajim att visa kontakters avatarer i register- och "
 "gruppchattsfönstren"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -1987,14 +1860,14 @@ msgstr ""
 "irriterar dig. Använd med förstånd, för det blockerar alla meddelanden från "
 "alla kontakter som inte finns i ditt register"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 #, fuzzy
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
@@ -2003,7 +1876,7 @@ msgstr ""
 "Om kryssad kommer Gajim också inkludera information om vem som skickade den "
 "nya e-posten"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2013,13 +1886,13 @@ msgstr ""
 "en kontakt från MSN kommer att ha motsvarade MSN-ikon för tillgänglig, "
 "frånvarande, upptagen, osv...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 #, fuzzy
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
@@ -2028,79 +1901,102 @@ msgstr ""
 "Om inte avstängd kommer Gajim ersätta ascii-smilies som \":)\" med "
 "motsvarande animerade eller statiska grafiska känsloikoner"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Logga kr_ypterad chattsession"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "_Gör meddelandefönstren kompakta"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Ha_ntera..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Aldrig\n"
-"Endast vid väntande händelser\n"
-"Alltid"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "_Aldrig"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Notifieringar"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Notifiera mig om kontakter som loggar _in"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Notifiera mig om kontakter som loggar _ut"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "_Notifiera mig om det"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Notifiera vid ny _Gmail-e-post"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Aldrig\n"
+"Endast vid väntande händelser\n"
+"Alltid"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Personliga händelser"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Spela _upp ljud"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
-"Visa popup\n"
-"Notifiera mig om den\n"
-"Visa endast i kontaktlista"
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "_Öppna det"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Server:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "Visa enbart i _registret"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "Visa i notifieringsyta:"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2108,27 +2004,27 @@ msgstr ""
 "Vissa meddelanden kan innehålla textformatering (formatering, färger etc). "
 "Om kryssad kommer Gajim att endast visa rå meddelandetext."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Sortera kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Status"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Status_ikoner:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Stil"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "T_ema:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2136,7 +2032,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2144,367 +2040,382 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Använd _transporternas ikoner"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Använd systemets _standard"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "När ny händelse tas emot:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Felmeddelande: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "För_e smeknamn:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "_Frånvarande efter:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "Visa _notifieringar för chattstatus:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Känsloikoner:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Filhanterare:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorera händelser från kontakter som inte finns i kontaktlistan"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ignorera textformatering i inkommande meddelanden"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Logga statusändringar för kontakter"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_E-postklient:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "_Inte tillgänglig efter:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Öppna..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "_Återställ till standardfärger"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Skicka notifieringar för chattstatus:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Statusmeddelande:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "_Fönsterbeteende:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "i _gruppchattar"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "i _kontaktlista"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "minuter"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Integritetslistor:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../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/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Lista över regler</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Integritetslistor</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Aktiv för denna session"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Aktiv vid varje uppstart"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Alla"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "alla efter prenumeration"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Tillåt"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Neka"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Ordning:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Integritetslista"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "alla efter prenumeration"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "alla i gruppen"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"ingen\n"
-"båda\n"
-"från\n"
-"till"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Båda"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Från"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "ett"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "två"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "att skicka mig meddelanden"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "att skicka mig frågor"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "att skicka mig status"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "att se min status"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Adress</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Avatar:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../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/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Stad:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../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/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Land:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Avdelning:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../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/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../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>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Efternamn:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Fullständigt namn</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Tilltalsnamn:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Webbplats:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>Mellannamn:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Namn:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Smeknamn:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../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/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Position:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Postnummer:</b>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Titel:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Roll:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../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/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Gatuadress:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Suffix:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Om"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Klicka för att ange din avatar"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: ÅÅÅÅ-MM-DD"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Personlig info"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Jobb"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../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>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Ta bort kontot _endast från Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Ta bort kontot från Gajim och från _servern"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "Ta _bort"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2512,192 +2423,143 @@ msgstr ""
 "<b>någon@någonstans.se</b> vill att du ska <b>lägga till</b> några kontakter "
 "till din kontaktlista."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_OK"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "Avbryt"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Lägg till _kontakt..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Fun_ktioner"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Fil_överföringar"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Frågor och svar (webb)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Hjälp på nätet"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Profil, a_vatar"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Visa endast _aktiva kontakter"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Visa _transporter"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Visa frånkopplade _kontakter"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Visa _kontaktlista"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "K_onton"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Innehåll"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_Frågor och svar"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Inställningar"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "A_vsluta"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "Skicka ett _meddelande..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "_Visa"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../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/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Sök"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "_Lägg till kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Sök"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "G_å"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Registrera hos"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Från:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Svara på detta meddelande"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "Skick_a"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Skicka meddelande och stäng fönster"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Till:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Skicka och stäng"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "Au_ktorisera"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../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"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2705,176 +2567,191 @@ msgstr ""
 "Neka auktorisering från kontakt så att han eller hon inte vet när du är "
 "ansluten"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Prenumerationsbegäran"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Neka"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Välj kontot med vilket du vill synkronisera"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../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/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Synkronisera : välj kontakter"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Inga ljud"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Skicka ett _meddelande"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Visa alla väntande _händelser"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Sta_tus"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Gruppchatt"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Fråga:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Klient:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>Län:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Jabber-ID:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Resurs:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Status:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Prenumeration:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>System:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Kommentarer"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Konfigurerad avatar:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Kontaktinformation"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Mer"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Användaravatar:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Typsnitt</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabbertrafik</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML-inmatning</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-msgstr "Aktivera"
+#: ../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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Info/Fråga (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/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "_Närvaro"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Redigera konto..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Lokal JID:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Personlig"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Resurs:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "En GTK+-baserad Jabber-klient"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Avbryt bekräftelse"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 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:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Tjänsten returnerade ett fel."
 
@@ -2899,7 +2776,7 @@ msgstr "Heltal"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Färg"
 
@@ -3036,86 +2913,86 @@ msgstr "svenska"
 msgid "Chinese (Ch)"
 msgstr "kinesiska"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Stavningsspråk"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "En anslutning är inte tillgänglig"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 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:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Understruken"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Genomstruken"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Typsnitt"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Ingen formatering"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Verkligen skicka filen?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "GPG-kryptering aktiverad"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Inte i kontaktlista"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Denna kontakt har inte stöd för filöverföringar."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Ingen GPG-nyckel tilldelad"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3123,50 +3000,50 @@ msgstr ""
 "Ingen GPG-nyckel har tilldelats denna kontakt. Därför kan du inte kryptera "
 "meddelanden med GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "GPG-kryptering inaktiverad"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Sessionen KOMMER att loggas"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Sessionen KOMMER INTE att loggas"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "är"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "är INTE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "kommer"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "kommer INTE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "och autentiserad"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3175,23 +3052,23 @@ msgstr ""
 "%(type)s-kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din chattsession %(logged)s att loggas."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Sessionsförhandlingen avbröts"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Denna session är krypterad"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " och KOMMER att loggas"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " och KOMMER INTE att loggas"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3199,25 +3076,25 @@ msgstr ""
 "Fjärrkontaktens identitet har inte verifierats. Klicka på sköldknappen för "
 "mer information."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "E2E-kryptering inaktiverad"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Följande meddelande var INTE krypterat"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 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:2388
+#: ../src/chat_control.py:2475
 #, 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:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3225,15 +3102,15 @@ msgstr ""
 "Om du stänger den här fliken och har historik inaktiverad så kommer "
 "meddelandet att förloras."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Databasfel"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3242,110 +3119,120 @@ 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:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s är nu %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "skapar loggdatabas"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "skapar loggdatabas"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, 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:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu att avslutas"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, 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:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "skapar katalogen %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Ändra statusinformation"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Ändra status"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Ställ in närvarotypen och en beskrivning"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "Ansluten"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Utökad frånvaro"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Stör inte"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Frånkopplad - koppla från"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Beskrivning av närvaro:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Statusen har ändrats."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Lämna gruppchattar"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s på %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Du har inte gått in i en gruppchatt."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 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:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Gruppchattar"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Du lämnade följande gruppchattar:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Vidarebefordra olästa meddelanden"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Alla olästa meddelanden har vidarebefordrats."
 
@@ -3441,9 +3328,9 @@ msgid ""
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "standard"
 
@@ -3716,11 +3603,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:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3729,7 +3616,7 @@ msgstr ""
 "avatar senaste gången, eller som har en mellanlagrad avatar som är för "
 "gammal."
 
-#: ../src/common/config.py:230
+#: ../src/common/config.py:231
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3738,7 +3625,7 @@ msgstr ""
 "Om False kommer du inte längre att se en statusrad i chattfönstret när en "
 "kontakt byter hans eller hennes status och/eller statusmeddelande."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3747,28 +3634,28 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 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:234
+#: ../src/common/config.py:235
 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:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Visa inte avatar för själva transporten."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Visa inte kontaktlista i systemets fönsterlista."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3778,7 +3665,7 @@ msgstr ""
 "fönstret att blinka (standardbeteendet i de flesta fönsterhanterare) när det "
 "finns väntande händelser."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:242
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3790,7 +3677,7 @@ msgstr ""
 "SHA-info i gruppchattnärvaroinformation"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3810,33 +3697,33 @@ msgstr ""
 "visas i ett specifikt fönster. OBS: Gajim måste startas om för att denna "
 "inställning skall börja gälla."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 #, 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:246
+#: ../src/common/config.py:247
 #, 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:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Döljer knapparna i chattfönster."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Döljer bannern i ett gruppchattfönster"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Döljer bannern i chattfönster för två personer"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Döljer deltagarlistan i gruppchattfönster."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3844,16 +3731,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:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Skicka meddelande och stäng fönster"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3861,199 +3748,222 @@ msgid ""
 msgstr ""
 "Lista på färger som kommer användas för att färga smeknamnet i gruppchattar.<"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 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:256
+#: ../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:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:259
+#: ../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."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, 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:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktivera ESessions-kryptering för detta konto."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 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:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Visa en varningsdialog innan standard-SSL-biblioteket används."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Temporär lösning för Jabberd2"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4061,25 +3971,30 @@ 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:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, 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:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Är OpenPGP aktiverat för denna kontakt?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4087,101 +4002,101 @@ msgstr ""
 "Ska Gajim automatiskt starta en krypterad session med denna kontakt om "
 "möjligt?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 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:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "alla eller mellanslagsseparerad status"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "\"yes\", \"no\" eller \"both\""
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "\"yes\", \"no\" eller \"\""
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, lämna ett meddelande."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Jag är tillgänglig."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Jag är ledig för chatt."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Strax tillbaka."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Jag är inte tillgänglig."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Stör inte."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Hejdå!"
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:490
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4190,58 +4105,50 @@ 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:476
+#: ../src/common/config.py:491
 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:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Kunde inte läsa in idle-modul"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Fel värd"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Ogiltig lokal adress? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registreringsinformation för transporten %s har inte kommit fram i tid"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Registreringen lyckades"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s lyckades"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4249,39 +4156,39 @@ msgstr ""
 "Registrering med agenten %(agent)s misslyckades med fel %(error)s: %"
 "(error_msg)s"
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Osynlighet stöds inte"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Kontot %s saknar stöd för osynlighet."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4291,7 +4198,7 @@ msgstr ""
 "gajim.org/wiki/DatabaseBackup) eller ta bort den (alla historik kommer att "
 "förloras)."
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Smeknamnet tillåts inte: %s"
@@ -4299,78 +4206,78 @@ msgstr "Smeknamnet tillåts inte: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du är bannlyst från gruppchatten %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppchatten %s finns inte."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Möjligheten att skapa rum är begränsad."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerade smeknamn måste användas i gruppchatten %s."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du är inte med i medlemslistan i gruppchatten %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan gå in i detta rum istället: %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi prenumererar nu på %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "avprenumerationsförfrågan från %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi prenumererar inte längre på %s"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4508,28 +4415,28 @@ msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Detta meddelande är *krypterat* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4538,78 +4445,78 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Återanslut manuellt."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, 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:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Servern %s tillhandahöll ett annat registreringsformulär"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Okänt SSL-fel: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, 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:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din anslutning eller försök igen senare."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Servern svarade: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunde inte ansluta till kontot %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, 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:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4618,7 +4525,7 @@ msgstr ""
 "\n"
 "SSL-fel: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4627,72 +4534,72 @@ msgstr ""
 "\n"
 "Okänt SSL-fel: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din anslutning eller försök igen senare"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering mot \"%s\" misslyckades"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Kontrollera ditt inloggningsnamn och lösenord."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "problem vid sändning %s ( %s )"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Skickade kontakt: \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "Bjud in _kontakter"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Inte hämtad på grund av osynlig status"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, 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:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Observerande"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Transporter"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Inte i kontaktlista"
 
@@ -4701,39 +4608,51 @@ msgstr "Inte i kontaktlista"
 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:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2- (aka python-pysqlite2) beroende saknas. Stänger av..."
+#: ../src/common/dbus_support.py:54
+#, 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/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, 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"
+
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Databasen kan inte läsas."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 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:63
+#: ../src/common/exceptions.py:67
 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"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
-msgstr ""
-"Sessionsbussen är inte tillgänglig.\n"
-"Läs http://trac.gajim.org/wiki/GajimDBus för hjälp"
+"Try reading %(url)s"
+msgstr "Sessionsbus finns inte tillgänglig."
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
+msgstr "Sessionsbus finns inte tillgänglig."
 
 #: ../src/common/fuzzyclock.py:38
 msgid "twelve"
@@ -4898,241 +4817,278 @@ msgstr "Slutet av veckan"
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Ogiltigt tecken i användarnamn"
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Serveradress krävs."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Ogiltigt tecken i värdnamn."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Tillgänglig"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "Fr_ånvarande"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "Till"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Båda"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Ägare"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Administratör"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 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:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, 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:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " från rummet %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " från användaren %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " från %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, 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:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Rumkonfiguration"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+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"
@@ -5142,17 +5098,74 @@ msgstr "Fel vid körning av \"%(command)s\": %(error)s"
 msgid "%s is not a valid loglevel"
 msgstr "%s är inte en giltig loggnivå"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Standardmeddelande"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Storlek: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "migrerar loggdatabas till index"
 
@@ -5792,19 +5805,19 @@ msgstr "Studerar"
 msgid "Writing"
 msgstr "Skriver"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Okänd artist"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Okänd titel"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Okänd källa"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5814,12 +5827,12 @@ msgstr ""
 "från <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../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:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5827,7 +5840,7 @@ msgstr ""
 "Du kanske har en annan Gajiminstans igång. Filöverföringen kommer stängas."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -5897,24 +5910,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Fel när tjänsten lades till. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Avstängd"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Standardmeddelande"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbok för språket %s inte tillgängligt"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5923,213 +5932,213 @@ 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:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Återanslut nu?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 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:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP är inte användbar på den här datorn"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Olästa händelser"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 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:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har öppnat chatt i kontot %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 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:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 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:1830
+#: ../src/config.py:1935
 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:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Kontonamn används redan"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 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:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Byt namn på konto"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Ange ett nytt namn för kontot %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 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:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, 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:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 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:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 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:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Din server saknar stöd för Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Din server kan inte spara din personliga information."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, 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:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Kontot Local används redan."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 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:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Bannlista"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Ägarlista"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Administratörslista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6137,11 +6146,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6149,11 +6158,11 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6161,11 +6170,11 @@ msgstr ""
 "<b>Vem vill du göra till ägare?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Lägger till administratör..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6173,7 +6182,7 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6189,59 +6198,87 @@ 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:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Känsloikoner inaktiverade"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Ange ditt lösenord för kontot %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Anslutning till proxyservern misslyckades"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Vad vill du göra?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Ta bort kontot _endast från Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:Alla"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "In- och utgång enbart"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Ny gruppchatt"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
@@ -6249,27 +6286,27 @@ msgstr ""
 "bokmärket."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Tecknet tillåts inte"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Ogiltig server"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Ogiltigt rum"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Kontot har lagts till"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6279,33 +6316,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:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Ditt nya konto har skapats"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 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:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr "Ange en server på vilken du vill registrera."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Certifikatet finns redan i filen"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, 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:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6320,7 +6357,7 @@ msgstr ""
 "SSL-fel: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6331,59 +6368,59 @@ msgstr ""
 "SHA1-fingeravtryck för certifikatet:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skapades"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Första meddelandet mottaget"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Nästa meddelande blev fokuserat"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Nästa meddelande blev ofokuserat"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Kontakt loggade in"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Kontakt loggade ut"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Meddelande skickat"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Meddelande mottaget i gruppchatt"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "E-post mottaget på GMail"
 
@@ -6402,45 +6439,45 @@ msgstr ""
 "Texten under denna linje är vad som har sagts\n"
 "sedan du senast hade fokus på denna gruppchatt"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "A_vsluta"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Öppna som _länk"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6448,7 +6485,7 @@ msgstr[0] "Igår"
 msgstr[1] "Igår"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
@@ -6552,66 +6589,66 @@ msgstr "Yahoo!-adress:"
 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:874
+#: ../src/dialogs.py:875
 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:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan inte lägga till dig själv i din kontaktlista."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i kontaktlistan"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Denna kontakt finns redan i din kontaktlista."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Användar-id:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ version:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK version:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Nuvarande utvecklare:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -6621,7 +6658,7 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6634,104 +6671,104 @@ msgstr ""
 "\n"
 "Markeringsfunktionen för felstavade ord kommer inte att användas"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "Smeknamnet innehåller icke-tillåtna tecken."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, 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:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du är redan i gruppchatten %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 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:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, 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:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, 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:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Det här är ingen gruppchatt"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s är inte namnet på en gruppchatt."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Detta konto är inte anslutet till servern"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 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:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6740,173 +6777,171 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "Anslutningen är inte tillgänglig"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Ogiltigt JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kunde inte tolka \"%s\"."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan inte ändra ditt lösenord utan en anslutning."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Kontakten loggade in"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Kontakten ändrade status"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Ett meddelande med kontot %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Ett meddelande i kontot %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "XML-konsol"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Ledsen"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Ändra"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "Ta _bort"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -6914,152 +6949,152 @@ 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:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Lägg till"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Ändra"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber-ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Grupper"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, 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:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "_Lägg till kontakt"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Ta bort en kontakt från kontaktlista"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privat identitetslista <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privat integritetslista för %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordning: %(order)s, åtgärd: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redigera en regel</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Lägg till en regel</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privata integritetslistor för %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Integritetslistor"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Ogiltigt listnamn"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 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:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har bjudit in dig till en diskussion"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, 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:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Vill du acceptera inbjudan?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Villkor"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "när jag är "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7070,38 +7105,38 @@ msgstr ""
 "\n"
 "Denna sessions Short Authentication String är <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Du har redan verifierat identiteten för denna kontakt."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet är verifierad"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Verifiera igen..."
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet är INTE verifierad"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Verifiera..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifierat kontaktens identitet?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7111,77 +7146,77 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Andra"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Konferens"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 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:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7189,93 +7224,97 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 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:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bläddrar i %(address)s med kontot %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 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:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "_Kör kommando"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Söker av %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Användare"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Beskrivning"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Bokmärk"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Bokmärke finns redan"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Bokmärket har lagts till"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 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:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Nod"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "Säg _upp prenumeration"
 
@@ -7325,7 +7364,7 @@ msgstr "Kräver python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Funktionen är inte tillgänglig under Windows."
 
@@ -7489,102 +7528,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Kräver python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Banners och klickbara länkar"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Kräver python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Kräver python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Funktion"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Fil"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Tid"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Förlopp"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Filnamn: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, 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:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Du"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Mottagare: "
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Sparad i: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Filöverföring färdig"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "_Öppna mapp"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Filöverföringen avbruten"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../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:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Mottagare: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Felmeddelande: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Filöverföringen stoppad"
 
@@ -7592,7 +7619,7 @@ msgstr "Filöverföringen stoppad"
 msgid "Choose File to Send..."
 msgstr "Välj fil att skicka..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Beskrivning: "
 
@@ -7624,12 +7651,12 @@ msgstr "Beskrivning: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, 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:860
+#: ../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."
@@ -7637,22 +7664,22 @@ msgstr ""
 "En fil med det här namnet existerar redan och du har inte rättigheter att "
 "skriva över den."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" är inte skrivbar"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 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."
 
@@ -7688,70 +7715,56 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Sändare: "
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Paus"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Fortsätt"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim behöver Xserver för att köra. Avbryter..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim behöver PyGTK 2.12 eller senare"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "Gajim behöver PyGTK 2.12 eller senare för att köra. Avbryter..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim behöver GTK 2.12 eller senare"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "Gajim behöver GTK 2.12 eller senare för att köra. Avbryter..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ runtime saknar libgladestöd"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Ta bort din nuvarande GTK+ runtime och installera senaste stabila version "
-"från %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Kontrollera att GTK+ och PyGTK har libglade-stöd i ditt system."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Gajim behöver PySQLite2 för att fungera"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behöver pywin32 för att köra"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7760,11 +7773,11 @@ msgstr ""
 "Kontrollera att Pywin32 är installerat på ditt system. Du kan hämta det på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim körs redan"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7808,8 +7821,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "konto"
 
@@ -7831,12 +7844,15 @@ msgid "status"
 msgstr "status"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "meddelande"
 
@@ -8077,70 +8093,89 @@ msgstr ""
 "skickas till alla konton"
 
 #: ../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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Hantera en xmpp:/ URI"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "URI"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "URI att hantera"
 
-#: ../src/gajim-remote.py:271
+#: ../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:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Meddelandeinnehåll"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Gå in i ett MUC-rum"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "Rummets JID"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "smeknamn"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Smeknamn att använda"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "lösenord"
 
-#: ../src/gajim-remote.py:281
+#: ../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:282
+#: ../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:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Kontrollera om Gajim är igång"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Visar eller döljer ipython-fönstret"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8149,17 +8184,17 @@ msgstr ""
 "\"%s\" finns inte i din kontaktlista.\n"
 "Ange konto för att skicka meddelandet."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Det verkar som om Gajim inte är igång. Därför kan du inte använda gajim-"
 "remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8168,16 +8203,16 @@ msgstr ""
 "Användning: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8186,7 +8221,7 @@ msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8195,7 +8230,7 @@ msgstr ""
 "För många argument. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer information"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8204,7 +8239,11 @@ msgstr ""
 "Argumentet \"%(arg)s\" är inte angivet. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer info"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Felaktig uri"
 
@@ -8233,198 +8272,199 @@ msgstr "Du kan inte ta bort ditt nuvarande tema"
 msgid "Please first choose another for your current theme."
 msgstr "Välj först ett annat för ditt aktuella tema."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Skicka privat meddelande misslyckades"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Infoga smeknamn"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Konversation med "
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Fortsatt konversation"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Rumsloggning är aktiverad"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Ett nytt rum har skapats"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 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:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, 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:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, 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:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Anknytning: "
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "rumskonfigurationen har ändrats till members-only"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "systemet stängs av"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, 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:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 är nu %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, 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:1708
+#: ../src/groupchat_control.py:1690
 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:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "Fråga mig i_nte igen"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Förstör %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -8445,59 +8485,59 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Rapportera fel"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Detaljer"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 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:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim är inte standardklient för Jabber"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 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:772
+#: ../src/gtkgui_helpers.py:820
 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:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Utökning stöds inte"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8508,58 +8548,58 @@ msgstr ""
 "av\n"
 "en annan deltagare. Ange ett annat smeknamn nedan:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 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:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterar du den här begäran på kontot %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s)-auktorisering för %(url)s (id: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Anslutningsfel"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fel vid sändning av %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Prenumerationsbegäran"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, 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:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8567,60 +8607,60 @@ 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Säg _upp prenumeration"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, 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:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Rummet visar nu otillgängliga medlemmar"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "rummet visar nu inga otillgängliga medlemmar"
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Rumsloggning är nu aktiverad"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Rumsloggning är nu inaktiverad"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Rummet är nu icke-anonymt"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Rummet är nu semi-anonymt"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Rummet är nu fullständigt anonymt"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, 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:1137
+#: ../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"
@@ -8628,24 +8668,24 @@ msgstr ""
 "Du har konfigurerat Gajim till att använda GPG-agent, men det finns ingen "
 "GPG-agent igång eller så returnerade den en felaktig lösenfras.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 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:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG-nyckeln är inte pålitlig"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8653,27 +8693,28 @@ 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:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, 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:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8688,42 +8729,42 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Fjärrkontakten stoppade överföringen"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Fel vid öppnande av filen"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, 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:1454
+#: ../src/gui_interface.py:1479
 #, 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:1467
+#: ../src/gui_interface.py:1492
 #, 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:1471
+#: ../src/gui_interface.py:1496
 #, 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:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8732,56 +8773,57 @@ msgstr ""
 "Kunde inte dekryptera meddelande från %s\n"
 "Det kan ha manipulerats."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Kunde inte dekryptera meddelande"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Användarnamn-konflikt"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 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:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Fel."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Resurskonflikt"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Du är redan ansluten till detta konto med samma resurs. Ange en annan"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Fel vid verifiering av SSL-certifikat"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8792,15 +8834,15 @@ msgstr ""
 "server: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ignorera detta fel med certifikatet."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "SSL-certifikatfel"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8817,23 +8859,28 @@ msgstr ""
 "\n"
 "Vill du fortfarande ansluta och uppdatera fingeravtrycket för certifikatet?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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 okrypterad anslutning. Är du "
-"säker på att du vill göra det?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -8842,21 +8889,30 @@ msgstr ""
 "installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
 "skicka lösenordet?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+msgid ""
+"You are about to send your password unencrypted on an insecure connection. "
+"Are you sure you want to do that?"
+msgstr ""
+"Du är på väg att skicka ditt lösenord över en okrypterad anslutning. Är du "
+"säker på att du vill göra det?"
+
+#: ../src/gui_interface.py:2064
 msgid "PEP node was not removed"
 msgstr "PEP-noden togs inte bort"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "PEP-noden %(node)s blev inte borttagen: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
@@ -8864,7 +8920,7 @@ msgstr ""
 "Ditt konfigurerade känsloikontema hittades inte så känsloikoner har "
 "inaktiverats."
 
-#: ../src/gui_interface.py:2570
+#: ../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 "
@@ -8874,41 +8930,41 @@ msgstr ""
 "uppdatera formatet för filen emoticons.py. Se http://trac.gajim.org/wiki/"
 "Emoticons för mer information."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "GPG-nyckeln har gått ut"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "Din GPG-nyckel har gått ut. Du kommer anslutas till %s utan OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
 
@@ -8916,43 +8972,43 @@ msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
 msgid "_New Group Chat"
 msgstr "_Ny gruppchatt"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 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:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Meddelande"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -8966,26 +9022,26 @@ msgstr ""
 "\n"
 "Om du väljer JA, vänta..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Exporterar Loggar..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, 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:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Denna operation kan inte göras ogjord."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 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?"
@@ -9025,35 +9081,35 @@ msgstr "Status är nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Bild är för stor"
 
-#: ../src/message_window.py:225
+#: ../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:226
+#: ../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:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Chattar"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Gruppchatt"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Meddelanden"
 
@@ -9065,22 +9121,22 @@ msgstr "- meddelanden kommer att loggas"
 msgid "- messages will not be logged"
 msgstr "- meddelanden kommer inte att loggas"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ändrade status"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s loggade in"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s loggade ut"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
@@ -9105,7 +9161,7 @@ msgstr "Skickat av %(nickname)s"
 msgid "New Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "Ignorera"
 
@@ -9113,18 +9169,18 @@ msgstr "Ignorera"
 msgid "Retrieving profile..."
 msgstr "Hämtar profil..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Filen är tom"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Kunde inte läsa in bild"
 
@@ -9156,53 +9212,53 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, försök "
 "igen senare."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, 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:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG är inte användbar"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du kommer ansluta till %s utan OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9210,27 +9266,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:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "inte i synk"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Verkligen avsluta Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Är du säker på att du vill avsluta Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Stäng alltid Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Avbryt filöverföring"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9238,16 +9305,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:2577
+#: ../src/roster_window.py:2651
 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:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9255,11 +9322,11 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "med denna transport."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Transporter kommer att tas bort"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9268,70 +9335,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:2653
+#: ../src/roster_window.py:2731
 #, 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:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Byt namn på kontakt"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Ange ett nytt smeknamn för kontakten %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Byt namn på grupp"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Ange ett nytt namn för gruppen %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, 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:2793
+#: ../src/roster_window.py:2880
 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:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, 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:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9340,11 +9407,11 @@ msgstr ""
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9352,18 +9419,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:3229
+#: ../src/roster_window.py:3323
 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:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter kommer att tas bort från din kontaktlista"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9373,33 +9440,33 @@ msgstr ""
 "så kommer du även ta bort behörigheten vilket resulterar i att kontakten "
 "kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 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:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9407,13 +9474,13 @@ msgstr ""
 "Din server saknar stöd för att lagra information om metakontakter. Denna "
 "information kommer därför inte att sparas vid nästa återanslutning."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 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:3986
+#: ../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 "
@@ -9423,24 +9490,24 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ogiltig Fil"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, 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:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Skicka %s till %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Gör %s till en metakontakt för %s"
@@ -9450,127 +9517,131 @@ msgstr "Gör %s till en metakontakt för %s"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "använder kontot %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "använder %s-kontot"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Hantera bokmärken..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Ändra statusmeddelande"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Publicera låt"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Publicera låt"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Konfigurera tjänster..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Maximera alla"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Skicka gruppm_eddelande"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Till alla användare"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Till alla anslutna användare"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Hantera kontakter"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Skicka ett meddelande"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Hantera transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Ändra transport"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Maximera"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "_Koppla från"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Koppla från"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Historikhanterare"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Gå in i ny gruppchatt"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Ändra statusmeddelande..."
 
@@ -9601,13 +9672,13 @@ msgid "Confirm these session options"
 msgstr "Bekräfta dessa sessionsalternativ"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Fjärrklienten vill förhandla en session med dessa funktioner:\n"
 "\n"
@@ -9630,116 +9701,126 @@ msgstr ""
 "\n"
 "Vill du fortsätta med sessionen?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Byt Statusmeddelande..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "i _kontaktlista"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Dölj denna meny"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, 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:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [blockerad]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [minimerad]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Senaste status: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " sedan %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Prenumeration: "
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Låt:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Notifiering"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Hämta"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Skicka upp"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Inte startad"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Färdigställd"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pausad"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Denna tjänst har ännu inte svarat med detaljerad information"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9747,28 +9828,28 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Tid:Okänd"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "sedan %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tillhörighet:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9776,7 +9857,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9784,30 +9865,384 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 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:350
+#: ../src/vcard.py:349
 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:357
+#: ../src/vcard.py:356
 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:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "Det finns inga väntande prenumerationsbegäran."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Gå in i _gruppchatt..."
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Lägg till kontakt..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "_Upptäck tjänster"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Kör kommando..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Redigera konto"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Personliga händelser"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Starta chatt..."
+
+#~ msgid "_Status"
+#~ msgstr "_Status"
+
+#~ msgid "Account Modification"
+#~ msgstr "Kontoändring"
+
+#~ 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 ""
+#~ "Kryssa i det här så att Gajim ansluter till port 5223 där äldre servrar "
+#~ "förväntades ha SSL-stöd. Observera att Gajim använder TLS-kryptering som "
+#~ "standard om servern har stöd för det, samt att med det här alternativet "
+#~ "så kommer TLS att inaktiveras"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Redigera personlig information..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Värdnamn: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Om kryssad kommer Gajim att spara lösenordet i ~/.gajim/config med \"läs"
+#~ "\"-rättigheter enbart för dig och din administratör"
+
+#~ msgid "Port: "
+#~ msgstr "Port: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Proxyserver:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Spara _lösenfras (osäkert)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Skicka keep-alive-paket"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Använd _SSL (äldre)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Justera efter status"
+
+#~ msgid "gtk-add"
+#~ msgstr "Lägg till"
+
+#~ msgid "gtk-close"
+#~ msgstr "Stäng"
+
+#~ msgid "gtk-remove"
+#~ msgstr "Ta bort"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Ta bort MOTD"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Skicka servermeddelande..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Ta emot ett meddelande\n"
+#~ "Kontakten kopplade från \n"
+#~ "Kontakten ändrade status \n"
+#~ "Markeringsmeddelande i gruppchatt \n"
+#~ "Meddelande mottaget i gruppchatt \n"
+#~ "Filöverföring begärd \n"
+#~ "Filöverföring startad \n"
+#~ "Filöverföring färdig"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "kontakt(er)\n"
+#~ "grupp(er)\n"
+#~ "alla"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Gå in i _gruppchatt"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Kopiera JID/e-postadress"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Kopiera länkplats"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Skriv e-post"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Öppna länk i webbläsare"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Starta chatt"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Kontorad\n"
+#~ "Grupprad\n"
+#~ "Kontaktrad\n"
+#~ "Chattbanner"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Byt smek_namn..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Byt _ämne..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Konfigurera _rum..."
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Hantera rum"
+
+#~ msgid "Send _File"
+#~ msgstr "Skicka _fil"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Lägg till i kontaktlista"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Skicka privat meddelande"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Ange JID eller kontaktens namn\n"
+#~ "Historik för gruppchattar\n"
+#~ "All chatthistorik"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Hantera konton"
+
+#~ msgid "gtk-delete"
+#~ msgstr "Ta bort"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Lägg till denna kontakt till kontaktlistan (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Bokmärk detta rum (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Bläddra i chatthistoriken (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Ändra rummets ärende (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Ändra ditt smeknamn (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Bjud in kontakter till konversationen (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Skicka en fil (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Visa en lista över känsloikoner (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Visa en lista över formateringar"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Visa en meny över avancerade funktioner (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Visa kontaktens profil (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Alla chattstatusar\n"
+#~ "Endast skrivande\n"
+#~ "Inaktiverad"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Detektera vid varje Gajimstart\n"
+#~ "Använd alltid GNOMEs standardprogram\n"
+#~ "Använd alltid KDEs standardprogram\n"
+#~ "Använd alltid Xfces standardprogram\n"
+#~ "Anpassa"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Frikopplad kontaktlista med frikopplade chattar\n"
+#~ "Frikopplad kontaktlista med en chatt\n"
+#~ "Ett enda fönster för allting\n"
+#~ "Frikopplad kontaktlista med chatt, grupperad efter konto\n"
+#~ "Frikopplad kontaktlista med chatt, grupperad efter typ"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Visa popup\n"
+#~ "Notifiera mig om den\n"
+#~ "Visa endast i kontaktlista"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "ingen\n"
+#~ "båda\n"
+#~ "från\n"
+#~ "till"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Lägg till _kontakt..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Fun_ktioner"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Fil_överföringar"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Profil, a_vatar"
+
+#~ msgid "_Accounts"
+#~ msgstr "K_onton"
+
+#~ msgid "_Contents"
+#~ msgstr "_Innehåll"
+
+#~ msgid "_FAQ"
+#~ msgstr "_Frågor och svar"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Inställningar"
+
+#~ msgid "_Quit"
+#~ msgstr "A_vsluta"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "Skicka ett _meddelande..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Skicka ett _meddelande"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Sta_tus"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Gruppchatt"
+
+#~ msgid "Enable"
+#~ msgstr "Aktivera"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Redigera konto..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Fel värd"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Ogiltig lokal adress? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2- (aka python-pysqlite2) beroende saknas. Stänger av..."
+
+#~ msgid ""
+#~ "Session bus is not available.\n"
+#~ "Try reading http://trac.gajim.org/wiki/GajimDBus"
+#~ msgstr ""
+#~ "Sessionsbussen är inte tillgänglig.\n"
+#~ "Läs http://trac.gajim.org/wiki/GajimDBus för hjälp"
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Banners och klickbara länkar"
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Kräver python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ runtime saknar libgladestöd"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Ta bort din nuvarande GTK+ runtime och installera senaste stabila version "
+#~ "från %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr "Kontrollera att GTK+ och PyGTK har libglade-stöd i ditt system."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Gajim behöver PySQLite2 för att fungera"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Inkommande meddelande:"
 
@@ -10017,12 +10452,6 @@ msgstr " resurs med prioritet "
 #~ "%(title)s av %(artist)s\n"
 #~ "från %(source)s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Använd alltid OS/X standardprogram"
-
-#~ msgid "Custom"
-#~ msgstr "Anpassad"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "Dubblerat Jabber-ID"
 
@@ -10245,9 +10674,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "Sätt statusmeddelandet till nu spelandes _musikspår"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "Visa enbart i _registret"
-
 #~ msgid "The auto away status message"
 #~ msgstr "Det automatiska statusmeddelandet när du är frånvarande"
 
@@ -10281,18 +10707,9 @@ msgstr " resurs med prioritet "
 #~ msgid "_Advanced Notifications Control..."
 #~ msgstr "_Avancerad notifieringskontroll..."
 
-#~ msgid "_Never"
-#~ msgstr "_Aldrig"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "_Notifiera mig om det"
-
 #~ msgid "_Player:"
 #~ msgstr "_Spelare:"
 
-#~ msgid "_Pop it up"
-#~ msgstr "_Öppna det"
-
 #~ msgid "Address"
 #~ msgstr "Adress"
 
@@ -10482,9 +10899,6 @@ msgstr " resurs med prioritet "
 #~ msgid "<small>Romeo and Juliet</small>"
 #~ msgstr "<small>Romeo och Julia</small>"
 
-#~ msgid "Old stories"
-#~ msgstr "Gamla berättelser"
-
 #, fuzzy
 #~ msgid "Soliloquy"
 #~ msgstr "Monolog"
@@ -10734,9 +11148,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Open Download Page"
 #~ msgstr "Öppna nerladdningssida"
 
-#~ msgid "Session bus is not available."
-#~ msgstr "Sessionsbus finns inte tillgänglig."
-
 #, fuzzy
 #~ msgid "with account "
 #~ msgstr "konto: "
@@ -10885,9 +11296,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Always use compact _view"
 #~ msgstr "Visa alltid kompakt _vy"
 
-#~ msgid "Banner:"
-#~ msgstr "Banderoll:"
-
 #~ msgid ""
 #~ "Cancels the selected file transfer. If there is an incomplete file, kept "
 #~ "in the file system it will be removed. This operation is not reversable"
diff --git a/po/uk.po b/po/uk.po
index 561303cb7..f8f9a8dbc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: uk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-10-30 00:24+0200\n"
 "Last-Translator: Sergiy Yegorov <prapor@unixzone.org.ua>\n"
 "Language-Team: Ukrainian <kde-i18n-doc@kde.org>\n"
@@ -20,59 +20,11 @@ msgstr ""
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "Jabber клієнт, що базується на GTK+"
-
-#: ../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"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-msgid "Join _Group Chat..."
-msgstr "Приєднатись до _групової балачки"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "_Додати контакт..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "Ви_явити служби"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "_Виконати команду..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-msgid "_Modify Account"
-msgstr "_Змінити обліковий запис"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "Ві_дкрити «Вхідні» Gmail"
 
-#: ../data/glade/account_context_menu.glade.h:7
-msgid "_Personal Events"
-msgstr "_Особисті події"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-msgid "_Start Chat..."
-msgstr "_Почати балачку..."
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "_Стан"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 msgid ""
 "<b>Connecting to server</b>\n"
 "\n"
@@ -82,23 +34,23 @@ msgstr ""
 "\n"
 "Будь ласка, зачекайте..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>Будь ласка, оберіть один з наступних варіантів:</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>Будь ласка, вкажіть відомості щодо вашого облікового запису</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr "<b>Будь ласка, виберіть сервер</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr "@"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../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"
@@ -106,59 +58,66 @@ msgstr ""
 "Додати цей сертифікат до переліку довірених сертифікатів.\n"
 "SHA1 відбиток сертифікату:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 msgid "Anon_ymous authentication"
 msgstr "Анонімна авторизація"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "З'єднатись після натискання кнопки «Завершити»"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Майстер створення облікових записів"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 msgid "I already have an account I want to _use"
 msgstr "Я вже маю обліковий запис, який бажаю _використовувати"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "Я бажаю _зареєструвати новий обліковий запис"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 ""
 "Якщо буде позначено цей пункт, Gajim запам'ятає пароль цього облікового "
 "запису"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "Керування..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "Немає"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 msgid "Prox_y:"
 msgstr "Прокс_і:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "Зберегти _пароль"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "Налаштувати мій профіль після з’єднання"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "Використовувати інші вузол/порт"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -166,149 +125,143 @@ msgstr ""
 "Для з’єднання з мережею Jabber вам потрібен обліковий\n"
 "запис."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "Д_одатково"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "_Завершити"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 msgid "_Hostname:"
 msgstr "Назва _вузла:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>Різне</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>Особиста інформація</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../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/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "Зміна облікового запису"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "Облікові записи"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 msgid "Administration operations"
 msgstr "Адміністративні дії"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+msgid "Anonymous authentication"
+msgstr "Анонімна аутентифікація"
+
+#: ../data/gui/accounts_window.ui.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Автоматично відновлювати втрачене з'єднання"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "_З'єднуватись після запуску Gajim"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "_Змінити пароль"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"Позначте цей пункт, щоб Gajim використовував порт 5223 для з'єднання з "
-"застарілими серверами, які, як очікує програма використовують SSL-"
-"шифрування. Зауважте, що Gajim використовує TLS-шифрування, якщо не вказано "
-"іншого. Якщо позначити цей пункт шифрування буде вимкнено TLS"
+"Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через "
+"незахищеним з’єднанням."
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "Обрати _ключ..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "Натисніть. щоб змінити пароль цього облікового запису"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Натисніть, щоб запитати уповноваження від усіх контактів іншого облікового "
 "запису"
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+msgid "Co_nnect on Gajim startup"
+msgstr "_З'єднуватись після запуску Gajim"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "З'єднання"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "Редагувати особисті відомості..."
+#: ../data/gui/accounts_window.ui.h:19
+#: ../data/gui/zeroconf_information_window.ui.h:2
+msgid "E-Mail:"
+msgstr "Ел. пошта:"
+
+#: ../data/gui/accounts_window.ui.h:20
+#: ../data/gui/zeroconf_information_window.ui.h:3
+msgid "First Name:"
+msgstr "Ім'я:"
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "Загальне"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "Назва вузла: "
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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."
@@ -317,8 +270,13 @@ msgstr ""
 "адреси. окрім вашої, тому передавання файлів працюватиме з більшою "
 "ймовірністю."
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim буде отримувати пароль від агента GPG, "
+"наприклад, seahorse."
+
+#: ../data/gui/accounts_window.ui.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -326,16 +284,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim надсилатиме порожні пакети для "
 "запобігання простою з'єднання (такий простій може призводити до від'єднання)"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim буде зберігати паролі у файлі ~/.gajim/"
-"config, доступ на запис до якого матимете лише ви"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -343,8 +292,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim під час запуску буде автоматично "
 "намагатись з'єднатися з вказаним обліковим записом на сервері jabber"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -354,47 +302,49 @@ msgstr ""
 "спадним списком у нижній частині вікна реєстру) призведе до відповідних змін "
 "стану цього облікового запису"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"Якщо номер типового порту для вхідних повідомлень є неприйнятним для ваших "
+"налаштувань, ви можете налаштувати інший.\n"
+"Можливо, вам також доведеться змінити параметри брандмауера."
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Відомості про вас, які зберігаються на сервері"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID:"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "Прізвище:"
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "Об’є_днати облікові записи"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "Не обрано жодного ключа"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "Немає"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "Особисті відомості"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "Порт: "
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "Пріорите_т:"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -404,22 +354,20 @@ msgstr ""
 "від jabber-сервера, якщо з одним обліковим записом з’єднано декілька "
 "клієнтів. Повідомлення про події отримує клієнт з найвищим пріоритетом"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "Пріоритет змінюватиметься залежно від вашого стану."
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "Проксі:"
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "Пере_йменувати"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 msgid "Resour_ce:"
 msgstr "Ресур_с:"
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -433,201 +381,89 @@ msgstr ""
 "обліковим записом з ресурсів «Домівка» або «Робота». Ресурс з найвищім "
 "пріоритетом буде отримувати усі повідомлення та події. (Див. нижче)"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "Зберегти _пароль (небезпечно)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "Зберігати _журнал спілкування для усіх контактів"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+msgid "Send _keep-alive packets"
 msgstr "Надсилати пакети підтвердження дієздатності"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "_Синхронізувати стан облікового запису з загальним"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-msgid "Synchronise contacts"
-msgstr "Синхронізувати контакти"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "Використовувати _SSL (застаріле)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "Використовувати проксі передавання файлів"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "_Узгодити зі станом"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-msgid "_Name:"
-msgstr "_Назва:"
-
-#: ../data/glade/accounts_window.glade.h:4
-msgid "<b>Proxy</b>"
-msgstr "<b>Проксі</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-msgid "A_djust to status"
-msgstr "_Узгодити зі станом"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "Облікові записи"
-
-#: ../data/glade/accounts_window.glade.h:9
-msgid "Anonymous authentication"
-msgstr "Анонімна аутентифікація"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-"Позначте цей пункт, щоб Gajim запитував вас перед надсиланням пароля через "
-"незахищеним з’єднанням."
-
-#: ../data/glade/accounts_window.glade.h:17
-msgid "Co_nnect on Gajim startup"
-msgstr "_З'єднуватись після запуску Gajim"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "Ел. пошта:"
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "Ім'я:"
-
-#: ../data/glade/accounts_window.glade.h:24
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr ""
-"Якщо буде позначено цей пункт, Gajim буде отримувати пароль від агента GPG, "
-"наприклад, seahorse."
-
-#: ../data/glade/accounts_window.glade.h:29
-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/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID:"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "Прізвище:"
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "Об’є_днати облікові записи"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "Пере_йменувати"
-
-#: ../data/glade/accounts_window.glade.h:47
-msgid "Send _keep-alive packets"
-msgstr "Надсилати пакети підтвердження дієздатності"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 msgid "Synchroni_ze account status with global status"
 msgstr "_Синхронізувати стан облікового запису з загальним"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+msgid "Synchronise contacts"
+msgstr "Синхронізувати контакти"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr "Використовувати _агент GnuPG"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 msgid "Use cust_om hostname/port"
 msgstr "Використовувати інші вузол/порт"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 msgid "Use cust_om port:"
 msgstr "Використовувати інший порт:"
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "Використовувати проксі передавання файлів"
+
+#: ../data/gui/accounts_window.ui.h:54
 msgid "_Edit Personal Information..."
 msgstr "Редагувати особисті відомості..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 msgid "_Enable"
 msgstr "Увімкнути"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 msgid "_Hostname: "
 msgstr "Назва _вузла:"
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 msgid "_Manage..."
 msgstr "Керування..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 msgid "_Port: "
 msgstr "_Порт:"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr "_Попереджати перед використанням незахищеного з’єднання"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr "використовувати змінну середовища HTTP_PROXY"
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr "gtk-add"
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr "gtk-close"
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr "gtk-remove"
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "Обліковий _запис:"
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/gui/add_new_contact_window.ui.h:2
 msgid "A_llow this contact to view my status"
 msgstr "Д_озволити цьому контакту бачити мій стан"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "Додати новий контакт"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../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"
@@ -639,7 +475,7 @@ msgstr ""
 "з цього протоколу. Натисніть кнопку реєстрації\n"
 "для продовження."
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -647,410 +483,467 @@ msgstr ""
 "Ви маєте з’єднатися з транспортом, щоб мати змогу\n"
 "додавати контакти з цього протоколу."
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "_Група:"
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "_Прізвисько:"
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "П_ротокол:"
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "_Зареєструвати"
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../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/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 msgid "<b>An error has occurred:</b>"
 msgstr "<b>Сталася помилка:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr "<b>Оберіть команду для виконання:</b>"
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr "Ad-hoc команди — Gajim"
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr "Перевірити ще раз"
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 msgid "Error description..."
 msgstr "Опис помилки..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 msgid "Please wait while retrieving command list..."
 msgstr "Будь ласка, зачекайте на отримання переліку команд..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 msgid "Please wait while the command is sending..."
 msgstr "Будь ласка, зачекайте на надсилання команди..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr "Зачекайте, будь ласка..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr "Цей об’єкт jabber не виконує жодних команд."
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>Опис</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../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, щоб деякі з параметрів "
 "набули чинності"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "Редактор додаткових налаштувань"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "Фільтр:"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "Вилучити «Повідомлення дня»"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "Вилучає «Повідомлення дня»"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 msgid "Edit _Privacy Lists..."
 msgstr "Редагувати _списки конфіденційності..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 msgid "Sends a message to users currently connected to this server"
 msgstr "Надсилає повідомлення усім користувачам, з’єднаним з сервером"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 msgid "Set MOTD..."
 msgstr "Встановити «Повідомлення дня»..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "Встановлює «Повідомлення дня»"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "Показати _XML-консоль"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 msgid "Update MOTD..."
 msgstr "Оновити «Повідомлення дня»..."
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "Оновлює «Повідомлення дня»"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "_Адміністратор"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-msgid "_Send Server Message..."
-msgstr "_Надіслати серверне повідомлення..."
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr " вікно/закладка відкрите з цим контактом "
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>Дії</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>Умови</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>Звуки</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "Додаткові дії"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "Розширене керування сповіщеннями"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "Усі стани"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "Далеко"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "У справах "
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "Невидимка"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "Запустити команду"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "Дуже далеко"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "Один або більше особливих станів..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "В мережі / Вільний для спілкування"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "Відтворити звук"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"Отримано повідомлення\n"
-"Контакт від'єднався \n"
-"Контакт змінив стан \n"
-"Підсвічене повідомлення групової балачки \n"
-"Отримано повідомлення групової балачки \n"
-"Запит на передавання файла \n"
-"Передавання файла почалось \n"
-"Передавання файла закінчено"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr ""
 "_Задіяти UrgencyHint віконного менеджера, щоб змусити блимати позначку вікна "
 "балачки на панелі задач"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "_Вимкнути автоматичне відкриття вікна балачки"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "_Вимкнути існуючі виринаючі вікна"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "_Вимкнути існуючі звукові повідомлення для цієї події"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "_Вимкнути події появи у реєстрі"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "_Вимкнути події появи у системному лотку"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "_Повідомити мене виринаючим вікном"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "_Відкрити вікно балачки з користувачем"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "_Показати подію у реєстрі"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "_Показати подію у системному лотку"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "і я "
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "Контакти"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
-"контакт(и)\n"
-"група(и)\n"
-"усі"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "для "
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 msgid "Entry:"
 msgstr "Запис:"
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 msgid "Feed name:"
 msgstr "Назва подачі:"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 msgid "Last modified:"
 msgstr "Востаннє змінено:"
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 msgid "New entry received"
 msgstr "Отримано новий запис"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr "Ви отримали новий запис:"
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 msgid "Blocked Contacts"
 msgstr "Заблоковані контакти"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 msgid "<b>Message:</b> "
 msgstr "<b>Повідомлення:</b> "
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr "Встановити заняття"
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr "Встановити заняття"
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 msgid "<b>Message:</b>"
 msgstr "<b>Повідомлення:</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 msgid "<b>Mood:</b>"
 msgstr "<b>Настрій:</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "Змінити пароль"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "Введіть ще раз для підтвердження:"
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "Введіть новий пароль:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Вкажіть ваше нове повідомлення стану</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 msgid "Activity:"
 msgstr "Заняття:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 msgid "Mood:"
 msgstr "Настрій:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "Зразки повідомлень:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "Зберегти як зразок..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "Приєднатись до _групової балачки"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "№"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-msgid "_Add to Roster..."
-msgstr "_Додати до реєстру..."
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:3 ../data/gui/single_message_window.ui.h:1
+msgid "0"
+msgstr "0"
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "_Копіювати JID/адресу електронної пошти"
+#: ../data/gui/chat_control.ui.h:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "_Копіювати посилання"
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "_Відкрити редактор поштових повідомлень"
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "_Надіслати"
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "_Почати балачку"
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_to_muc_window.ui.h:1
 msgid "In_vite"
 msgstr "_Запросити"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr "Запросіть друзів!"
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 msgid "MUC server"
 msgstr "Сервер групової балачки"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr "Будь ласка, оберіть сервер групової балачки."
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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"
@@ -1058,187 +951,185 @@ msgstr ""
 "Ви маєте намір почати групову балачку.\n"
 "Оберіть контакти, які ви бажаєте запросити"
 
-#: ../data/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "З_апитати можливість бачити його/її стан"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 msgid "Add Special _Notification..."
 msgstr "Додати особливе _сповіщення"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 msgid "Assign Open_PGP Key..."
 msgstr "Призначити кл_юч OpenPGP..."
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 msgid "E_xecute Command..."
 msgstr "Виконати команду..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 msgid "Edit _Groups..."
 msgstr "Редагувати _групи..."
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "За_просити до"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 msgid "Invite _Contacts"
 msgstr "Запросити _контакти"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 msgid "Remo_ve"
 msgstr "В_илучити"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 msgid "Send Cus_tom Status"
 msgstr "Надіслати не_типовий стан"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "Надіслати окреме _повідомлення..."
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 msgid "Send _File..."
 msgstr "Надіслати _файл..."
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr "Встановити _нетиповий аватар..."
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "Почати _балачку"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 msgid "Toggle End to End Encryption"
 msgstr "Увімкнути або вимкнути наскрізне шифрування"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "Увімкнути або вимкнути Open_PGP-шифрування"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+msgid "_Add to Roster..."
+msgstr "_Додати до реєстру..."
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "_Дозволити йому/їй бачити мій стан"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 "_Заблокувати"
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "_Заборонити йому/їй бачити мій стан"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "_Журнал"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr "_Ігнорувати"
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 msgid "_Manage Contact"
 msgstr "К_ерування контактом"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 msgid "_Rename..."
 msgstr "Перей_менувати..."
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "_Підписка"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 "_Розблокувати"
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 msgid "_Unignore"
 msgstr "_Скасувати ігнорування"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "Заповніть форму."
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "Налаштування кімнати"
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "Редагувати групи"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 msgid "(<b>ESession</b> info)"
 msgstr "(Відомості <b>ESession</b>)"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr "Пере_вірити"
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr "<b>Перелік можливостей Gajim:</b>"
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 msgid "Features"
 msgstr "Можливості"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "Перелік активних, завершених та зупинених передач файлів"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "Скасувати передавання файла"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "Скасовує обране передавання файла"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../data/gui/filetransfers.ui.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Скасовує обране передавання файла і вилучає файл, що звантажувався"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "Споро_жнити"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "Перенесення файлів"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "Сховати вікно"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "Вилучити передавання файла зі списку."
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../data/gui/filetransfers.ui.h:9
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "Вилучає завершені, скасовані та невдалі передавання файлів зі списку"
 
-#: ../data/glade/filetransfers.glade.h:10
+#: ../data/gui/filetransfers.ui.h:10
 msgid "Shows a list of file transfers between you and others"
 msgstr "Показує список передавань файлів"
 
-#: ../data/glade/filetransfers.glade.h:11
+#: ../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"
@@ -1246,75 +1137,74 @@ msgstr ""
 "За допомогою цього пункту можна вилучити окреме передавання файла зі списку. "
 "Якщо це передавання ще триває, його буде зупинено, а потім вже вилучено"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показувати контекстне сповіщення про завершення передавання файла"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "_Продовжити"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "П_овідомити мене про завершення передавання файлу"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "В_ідкриту теку, яка містить цей файл"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "П_ризупинити"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "перелік передач файлів"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>Кольори вкладки стану балачки</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"Рядок облікового запису\n"
-"Рядок групи\n"
-"Рядок контакту\n"
-"Заголовок балачки"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "Обліковий запис"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "Жирний"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "Створення"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "Контакт"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "Тип шрифту:"
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Налаштування тем Gajim"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "Пішов"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "Група"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "Неактивний"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1322,7 +1212,7 @@ msgstr ""
 "Повідомлення\n"
 "групової балачки"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1330,109 +1220,73 @@ msgstr ""
 "Спрямовані повідомлення\n"
 "групової балачки"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "Призупинено"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "Колір _тексту:"
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "_Шрифт тексту:"
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "_Тло:"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-msgid "Change _Nickname..."
-msgstr "Змінити _псевдонім..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-msgid "Change _Subject..."
-msgstr "Змінити _тему..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-msgid "Configure _Room..."
-msgstr "Налаштувати _кімнату..."
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-msgid "_Bookmark"
-msgstr "_Закладка"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr "_Знищити кімнату"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-msgid "_Manage Room"
-msgstr "_Керування кімнатою"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr "_Мінімізувати після закриття"
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "Мо_дератор"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 msgid "Occupant Actions"
 msgstr "Дії учасника"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "Надіслати _файл"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "_Додати до реєстру"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "_Адміністратор"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "_Заблокувати"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "_Викинути"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "_Учасник"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "_Власник"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "_Надіслати конфіденційне повідомлення"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "_Голос"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 msgid "Create new post"
 msgstr "Створити нове повідомлення"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "Від"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "Тема"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../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. "
@@ -1443,26 +1297,20 @@ msgstr ""
 "запущено. Взагалі, уникайте вилучення контактів, з якими ви зараз "
 "спілкуєтеся."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../data/gui/history_manager.ui.h:3
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr ""
 "<big><b>Ласкаво просимо до інструменту керування журналами Gajim</b></big>"
 
-#. Change label for accept_button to action name instead of 'OK'.
-#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "Вилучити"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "Експортувати"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Інструмент керування журналами Gajim"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1477,404 +1325,422 @@ msgstr ""
 "лівій частині вікна ви можете обрати журнали, пошук у базі даних можна "
 "виконати нижче."
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "_Шукати у базі даних"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
-"Введіть JID або ім’я контакту\n"
-"Журнали групових балачок\n"
-"Журнали всіх балачок"
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "Ім'я контакту"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "Групові балачки"
+
+#: ../data/gui/history_window.ui.h:5
 msgid "Search:"
 msgstr "Пошук:"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "_Зберігати журнал спілкування"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
-msgid "Bookmark this room"
-msgstr "Зробити закладку на цій кімнаті"
+#: ../data/gui/join_groupchat_window.ui.h:2
+#, fuzzy
+msgid "Bro_wse Rooms"
+msgstr "_Перегляд"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "Приєднатись до групової балачки"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
-msgid "Join this room automatically when I connect"
+#: ../data/gui/join_groupchat_window.ui.h:4
+#, fuzzy
+msgid "Join this room _automatically when I connect"
 msgstr "Автоматично заходити до цієї кімнати після з’єднання"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "Псевдонім:"
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "Нещодавно:"
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "Кімната:"
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "Сервер:"
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "Зробити закладку на цій кімнаті"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "При_єднатися"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "Керування обліковими записами"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "Автоматичне приєднання"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде приєднуватись до цієї групової "
 "балачки після запуску"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "Керування закладками"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr "Мінімізувати після автоматичного приєднання"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "Показувати стан:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "Сервер:"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "Назва:"
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 msgid "PEP Service Configuration"
 msgstr "Налаштування служби повідомлення про стан"
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 msgid "_Configure"
 msgstr "_Налаштувати..."
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-msgid "gtk-delete"
-msgstr "gtk-delete"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>Властивості</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>Параметри</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+#: ../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/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "Керування профілями проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "Па_роль:"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 msgid "Proxy _Host:"
 msgstr "Проксі-_вузол:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 msgid "Proxy _Port:"
 msgstr "Проксі-п_орт:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/gui/manage_proxies_window.ui.h:9
+msgid "SOCKS5"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:10
 msgid "Use HTTP prox_y"
 msgstr "Використовувати HTTP-проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 msgid "Use proxy auth_entication"
 msgstr "Використовувати розпізнавання на проксі"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 msgid "_BOSH URL:"
 msgstr "_Адреса URL BOSH:"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+msgid "_Name:"
+msgstr "_Назва:"
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 msgid "_Type:"
 msgstr "Тип:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "_Користувач:"
 
-#: ../data/glade/message_window.glade.h:1
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "Додати цей контакт до реєстру (Ctrl+D)"
-
-#: ../data/glade/message_window.glade.h:2
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "Зробити закладку на цій кімнаті (Ctrl+B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr "Переглянути журнал балачки (Ctrl+H)"
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr "Змінити тему обговорення у кімнаті (Alt+T)"
-
-#: ../data/glade/message_window.glade.h:5
-msgid "Change your nickname (Ctrl+N)"
-msgstr "Змінити ваш псевдонім (Ctrl+N)"
-
-#: ../data/glade/message_window.glade.h:6
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "Запросити контакти до спілкування (Ctrl+G)"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr "Надіслати файл (Ctrl+F)"
-
-#: ../data/glade/message_window.glade.h:8
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "Показати список емоційок (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-msgid "Show a list of formattings"
-msgstr "Показати список інструментів форматування"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "Показати меню додаткових можливостей (Alt+A)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr "Показати профіль контакту (Ctrl+I)"
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "_Надіслати"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "Пароль"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>Редактор додаткових налаштувань</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>Програми</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>Дії</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 msgid "<b>Auto Status</b>"
 msgstr "<b>Автоматичне встановлення стану</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>Вигляд вікна балачки</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>Кольори рядків балачки</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>Сповіщення про стан у балачці</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>Умови</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>Нетипове</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 msgid "<b>Font</b>"
 msgstr "<b>Шрифт</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>Параметри GMail</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>Зразки повідомлень про стан</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 msgid "<b>Privacy</b>"
 msgstr "<b>Конфіденційність</b>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr "<b>Вигляд реєстру</b>"
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 msgid "<b>Status Messages</b>"
 msgstr "<b>Повідомлення про стан</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 msgid "<b>Themes</b>"
 msgstr "<b>Теми</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>По батькові:</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>Візуальні сповіщення</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "Додатково"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 msgid "Advanced..."
 msgstr "Додатково..."
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"Усі стани балачки\n"
-"Лише введення повідомлень\n"
-"Вимкнено"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "Усі стани"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "Дозволити надсилання інформації про _операційну систему"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "Дозволити надсилання інформації про _операційну систему"
+
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Дозволити сповіщення у разі встановленого стану в_ідійшов/зайнятий/тощо"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr "Дозволити звуки у стані _зайнятий."
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "Далеко"
+
+#: ../data/gui/preferences_window.ui.h:31
+#, fuzzy
+msgid "Always use GNOME default applications"
+msgstr "Завжди використовувати типові програми OS/X"
+
+#: ../data/gui/preferences_window.ui.h:32
+#, fuzzy
+msgid "Always use KDE default applications"
+msgstr "Завжди використовувати типові програми OS/X"
+
+#: ../data/gui/preferences_window.ui.h:33
+#, fuzzy
+msgid "Always use Xfce default applications"
+msgstr "Завжди використовувати типові програми OS/X"
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "Запитувати щодо повідомлення про стан, якщо я:"
 
-#: ../data/glade/preferences_window.glade.h:28
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"Автоматично визначати під час запуску Gajim\n"
-"Завжди використовувати типові програми GNOME\n"
-"Завжди використовувати типові програми KDE\n"
-"Завжди використовувати типові програми Xfce\n"
-"Власний набір"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "_З'єднуватись після запуску Gajim"
+
+#: ../data/gui/preferences_window.ui.h:39
 msgid "Chat message:"
 msgstr "Повідомлення балачки:"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr "Перевіряти при запуску, чи є Gajim _типовим клієнтом Jabber"
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "Створення"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "Налаштувати шрифт та колір інтерфейсу"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "Повідомлення балачки:"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "Ім'я контакту"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+msgid "Custom"
+msgstr "Нетиповий"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
 msgstr ""
-"Виокремлений реєстр з виокремленими вікнами балачок\n"
-"Виокремлений реєстр зі спільним вікном балачки\n"
-"Спільне вікно для всіх елементів\n"
-"Виокремлений реєстр з вікнами для кожного облікового запису\n"
-"Виокремлений реєстр з вікнами балачок за типом"
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "Вимкнено"
+
+#: ../data/gui/preferences_window.ui.h:51
 msgid "Display _activity of contacts in roster"
 msgstr "Показувати _заняття контактів у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "Показати _подробиці щодо скриньки"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "Показувати _настрій контактів у реєстрі"
+
+#: ../data/gui/preferences_window.ui.h:54
 msgid "Display _tunes of contacts in roster"
 msgstr "Показувати _музику контактів у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "Показувати _аватари контактів у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 msgid "Display m_ood of contacts in roster"
 msgstr "Показувати _настрій контактів у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "Показувати _повідомлення  про стан контактів з реєстру"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1884,7 +1750,7 @@ msgstr ""
 "ви вели з контактом. Тут ви можете вказати стани, які ви бажаєте бачити у "
 "вікні розмови."
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1894,7 +1760,7 @@ msgstr ""
 "спілкуванням з контактом. Тут ви можете зазначити стани, які ви бажаєте "
 "надсилати іншому учаснику балачки."
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../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"
@@ -1902,11 +1768,11 @@ msgstr ""
 "Gajim буде сповіщати вас про вихід з мережі контактів за допомогою "
 "контекстного вікна у нижній правій частині екрана"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 msgid "Hide all buttons in chat windows"
 msgstr "Сховати усі кнопки у вікнах балачок"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
@@ -1914,7 +1780,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim дозволить іншим визначати, яку "
 "операційну систему ви використовуєте"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
@@ -1922,14 +1788,14 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде також додавати інформацію про "
 "авторів листів"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде змінювати стан на «Відсутній», якщо "
 "комп’ютер не використовуватиметься."
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../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"
@@ -1937,7 +1803,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim змінюватиме стан на «Недоступний», якщо "
 "на комп’ютері не спостерігатиметься активності користувача довше, ніж"
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
@@ -1945,7 +1811,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати аватари контактів у "
 "вікні реєстру і групових балачках"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../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"
@@ -1953,28 +1819,36 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim буде показувати повідомлення про стан "
 "під ім'ям контакту у вікні реєстру і групових балачках"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim показуватиме рід занять контактів у "
 "вікні реєстру"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr ""
+"Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у вікні "
+"реєстру"
+
+#: ../data/gui/preferences_window.ui.h:71
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim показуватиме настрій контактів у вікні "
 "реєстру"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr ""
 "Якщо буде позначено цей пункт, Gajim показуватиме музику, яку слухають "
 "контакти у вікні реєстру"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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 "
@@ -1985,7 +1859,7 @@ msgstr ""
 "контекстного меню (клацання правою кнопкою миші), буде використано типову "
 "мову для контакту або групової балачки."
 
-#: ../data/glade/preferences_window.glade.h:64
+#: ../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 "
@@ -1996,7 +1870,7 @@ msgstr ""
 "можливістю, оскільки її за її використання всі повідомлення від контактів, "
 "яких немає у реєстрі, буде заблоковано."
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../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 "
@@ -2007,7 +1881,7 @@ msgstr ""
 "E2E, ваш співрозмовник має погодитися на запис до журналу, інакше "
 "повідомлення не буде записано до журналу."
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../data/gui/preferences_window.ui.h:76
 msgid ""
 "If checked, Gajim will show a notification when a new e-mail is received via "
 "GMail"
@@ -2015,7 +1889,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim показуватиме сповіщення про нові листи, "
 "отримані поштовою скринькою GMail"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2025,7 +1899,7 @@ msgstr ""
 "протоколу піктограми станів. (Приклад: для контактів MSN будуть використані "
 "відповідні піктограми msn для станів «в мережі», «відсутній» тощо)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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."
@@ -2033,7 +1907,7 @@ msgstr ""
 "Якщо буде позначено цей пункт, Gajim не запитуватиме про повідомлення стану. "
 "Програма використовуватиме вказане типове повідомлення."
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
@@ -2041,79 +1915,101 @@ msgstr ""
 "Якщо цей пункт буде позначено, Gajim замінюватиме ascii-емоційки, наприклад, "
 "':)' відповідними статичними або анімованими емоційками"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr "Записувати до журналу _шифровані сеанси балачки"
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 msgid "Ma_ke message windows compact"
 msgstr "У_щільнити компонування вікон повідомлень"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "Ке_рування..."
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
-"Ніколи\n"
-"Лише події, що очікують уваги\n"
-"Завжди"
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "Сервер"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 msgid "Notifications"
 msgstr "Сповіщення"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 msgid "Notify me about contacts that sign _in"
 msgstr "Сповіщати мене про в_хід контактів до мережі"
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 msgid "Notify me about contacts that sign _out"
 msgstr "Сповіщати мене про в_ихід контактів з мережі"
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "Сповіщати мене про в_ихід контактів з мережі"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "Сповіщати про нові листи _GMail"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+#, fuzzy
+msgid "Only when pending events"
+msgstr ""
+"Ніколи\n"
+"Лише події, що очікують уваги\n"
+"Завжди"
+
+#: ../data/gui/preferences_window.ui.h:90
 msgid "Personal Events"
 msgstr "Особисті події"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "Відтворювати _звуки"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
+#: ../data/gui/preferences_window.ui.h:92
+msgid "Pop it up"
 msgstr ""
-"Виринаюче сповіщення\n"
-"Сповіщати мене про це\n"
-"Просто показати у реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "Параметри"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "Сервер:"
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "_Показати подію у реєстрі"
+
+#: ../data/gui/preferences_window.ui.h:98
 msgid "Show systray:"
 msgstr "_Показати подію у системному лотку"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "Уві_йти"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "Вий_ти"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2122,27 +2018,27 @@ msgstr ""
 "тексту, кольори тощо). Якщо буде позначено цей пункт, Gajim показуватиме "
 "простий текст без форматування."
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 msgid "Sort contacts by status"
 msgstr "Впорядкувати контакти за станом"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "Стан"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 msgid "Status _iconset:"
 msgstr "Набір _піктограм стану:"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 msgid "Style"
 msgstr "Стиль"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "Т_ема:"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2152,7 +2048,7 @@ msgstr ""
 "Автоматичне повідомлення про відсутність. Якщо ви не вкажете тексту "
 "повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2162,366 +2058,381 @@ msgstr ""
 "Автоматичне повідомлення про недоступність. Якщо ви не вкажете тексту "
 "повідомлення, Gajim не змінюватиме поточного повідомлення про стан."
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 msgid "Use _transports icons"
 msgstr "Використовувати піктограми _транспортів"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "Використовувати _типове для системи"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 msgid "When new event is received:"
 msgstr "Якщо отримано нову подію:"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "Повідомлення про помилку: %s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "Псевдонім:"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 msgid "_Away after:"
 msgstr "«_Відсутній» через:"
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "_Веб-переглядач:"
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 msgid "_Display chat state notifications:"
 msgstr "_Показувати сповіщення стану балачки:"
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 msgid "_Emoticons:"
 msgstr "_Емоційки:"
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "_Менеджер файлів:"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "_Виділяти слова з помилками"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ігнорувати події від контактів поза реєстром"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 msgid "_Ignore rich content in incoming messages"
 msgstr "_Ігнорувати позначки форматування у вхідних повідомленнях"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "_Записувати зміни стану контактів"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "_Поштовий клієнт:"
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 msgid "_Not available after:"
 msgstr "«_Не доступний» через:"
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "_Відкрити..."
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "В_ідновити типові кольори"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 msgid "_Send chat state notifications:"
 msgstr "_Надсилати сповіщення про стан балачки:"
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "_Повідомлення про стан:"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr "Вид_ілення адрес URL:"
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr "Пов_едінка вікна:"
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 msgid "in _group chats"
 msgstr "у _групових балачках"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 msgid "in _roster"
 msgstr "у _реєстрі"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "хвилин"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "Списки конфіденційності:"
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>Додати / Змінити правило</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>Перелік правил</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>Список конфіденційності</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "Активний для поточного сеансу"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "Активний завжди"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "Всі"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 msgid "All (including subscription)"
 msgstr "Всі (за підпискою)"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "Дозволити"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "Відмовити"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "JabberID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "Порядок:"
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "Список конфіденційності"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "всі за підпискою"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "всі у групі"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"нічого\n"
-"взаємно\n"
-"від\n"
-"до"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "Обидва"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "Від"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "перша"
+
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "друга"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "для надсилання мені повідомлень"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "для надсилання мені запитів"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "для надсилання мені стану"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "для перегляду мого стану"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 msgid "<b>Address</b>"
 msgstr "<b>Адреса</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 msgid "<b>Avatar:</b>"
 msgstr "<b>Аватар:</b>"
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 msgid "<b>Birthday:</b>"
 msgstr "<b>День народження:</b>"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 msgid "<b>City:</b>"
 msgstr "<b>Місто:</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 msgid "<b>Company:</b>"
 msgstr "<b>Компанія:</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 msgid "<b>Country:</b>"
 msgstr "<b>Країна:</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 msgid "<b>Department:</b>"
 msgstr "<b>Відділ:</b>"
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 msgid "<b>E-Mail:</b>"
 msgstr "<b>Адреса ел. пошти:</b>"
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 msgid "<b>Extra Address:</b>"
 msgstr "<b>Додаткова адреса:</b>"
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 msgid "<b>Family:</b>"
 msgstr "<b>Прізвище:</b>"
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 msgid "<b>Full Name</b>"
 msgstr "<b>Ім’я повністю</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 msgid "<b>Given:</b>"
 msgstr "<b>Ім'я:</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 msgid "<b>Homepage:</b>"
 msgstr "<b>Домашня сторінка:</b>"
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 msgid "<b>Middle:</b>"
 msgstr "<b>По батькові:</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 msgid "<b>Name:</b>"
 msgstr "<b>Ім’я:</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 msgid "<b>Nickname:</b>"
 msgstr "<b>Псевдонім:</b>"
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 msgid "<b>Phone No.:</b>"
 msgstr "<b>Номер телефону:</b>"
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 msgid "<b>Position:</b>"
 msgstr "<b>Посада:</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 msgid "<b>Postal Code:</b>"
 msgstr "<b>Поштовий індекс:</b>"
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 msgid "<b>Prefix:</b>"
 msgstr "<b>Префікс:</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../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>Роль:</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 msgid "<b>State:</b>"
 msgstr "<b>Область:</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 msgid "<b>Street:</b>"
 msgstr "<b>Вулиця:</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 msgid "<b>Suffix:</b>"
 msgstr "<b>Суфікс:</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "Відомості"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "Натисніть, щоб встановити свій аватар"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: РРРР-ММ-ДД"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "Особисті відомості"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "Робота"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>Що бажаєте робити?</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "Вилучити обліковий запис _лише з Gajim"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "Вилучити обліковий запис з Gajim та з _сервера"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "В_илучити"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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."
@@ -2529,195 +2440,146 @@ msgstr ""
 "<b>someone@somewhere.com</b> бажає <b>додати</b> до вашого реєстру де-які "
 "контакти."
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 "Тіло повідомлення <наразі не використовується, тому зазвичай приховане>"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr "Обмін елементами реєстру"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "_Гаразд"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-msgid "gtk-cancel"
-msgstr "gtk-cancel"
-
-#: ../data/glade/roster_window.glade.h:1
-msgid "Add _Contact..."
-msgstr "Додати _контакт..."
-
-#: ../data/glade/roster_window.glade.h:2
-msgid "Fea_tures"
-msgstr "Мо_жливості"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "Передавання _файлів"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "Часті питання (в Мережі)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "Довідка у Тенетах"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "Профіль, _аватар"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 msgid "Show Only _Active Contacts"
 msgstr "Показувати _від’єднані контакти"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "Показувати транс_порти"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "Показувати _від’єднані контакти"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "Показати _реєстр"
 
-#: ../data/glade/roster_window.glade.h:13
-msgid "_Accounts"
-msgstr "_Облікові записи"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "_Дії"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "_Вміст"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "_ЧаП"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "_Довідка"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "_Параметри"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "Ви_йти"
-
-#: ../data/glade/roster_window.glade.h:24
-msgid "_Send Single Message..."
-msgstr "_Надіслати окреме повідомлення..."
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "П_ерегляд"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 msgid "Please wait while retrieving search form..."
 msgstr "Будь ласка, зачекайте на отримання пошукової форми..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "Пошук"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 msgid "_Add contact"
 msgstr "Дод_ати контакт"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 msgid "_Information"
 msgstr "_Інформація"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "_Пошук"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "В_перед"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "_Адреса:"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "Зареєструватись на"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "Від:"
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "Відповісти на це повідомлення"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "_Надіслати"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "Надіслати повідомлення"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "Надіслати повідомлення і закрити вікно"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "Кому:"
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "_Відповісти"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "_Надіслати і закрити"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "_Уповноважити"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../data/gui/subscription_request_window.ui.h:2
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr ""
 "Уповноважити контакт, щоб він або вона могли бачити, коли ви виходите на "
 "зв'язок."
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
@@ -2725,175 +2587,190 @@ msgstr ""
 "Заборонити уповноваження контакту, щоб він або вона не могли бачити, коли ви "
 "виходите на зв'язок."
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "Запит на підписку"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "_Заборонити"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Оберіть обліковий запис, з яким слід виконати синхронізацію"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 msgid "Select the contacts you want to synchronise"
 msgstr "Виберіть контакти, які ви бажаєте синхронізувати"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr "Синхронізація: оберіть контакти"
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "Вимкнути звук"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "Надіслати окреме _повідомлення"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "Показати усі _події з черги"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "Ста_н"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "_Групова балачка"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 msgid "<b>Ask:</b>"
 msgstr "<b>Запитати:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 msgid "<b>Client:</b>"
 msgstr "<b>Клієнт:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 msgid "<b>Contact time:</b>"
 msgstr "<b>Область:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 msgid "<b>Jabber ID:</b>"
 msgstr "<b>Ідентифікатор Jabber:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 msgid "<b>Resource:</b>"
 msgstr "<b>Ресурс:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 msgid "<b>Status:</b>"
 msgstr "<b>Стан:</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 msgid "<b>Subscription:</b>"
 msgstr "<b>Підписка:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 msgid "<b>System:</b>"
 msgstr "<b>Система:</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "Коментарі"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 msgid "Configured avatar:"
 msgstr "Налаштований аватар:"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "Контактна інформація"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "Більше"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 msgid "User avatar:"
 msgstr "Аватар користувача:"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>Шрифт</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Трафік Jabber</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>Ввід XML</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "Інформація/Запит"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "_Повідомлення"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "П_рисутність"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "_Змінити обліковий запис..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "Локальний jid:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "Особисте"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "Стан:"
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "Jabber клієнт, що базується на GTK+"
+
+#: ../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:298
 msgid "Cancel confirmation"
 msgstr "Скасувати підтвердження"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Зараз виконується команда. Ви справді бажаєте скасувати її виконання?"
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr "Служба надіслала неправильно форматовані дані"
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr "Служба змінила ідентифікатор сеансу."
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr "Служба повернула повідомлення про помилку."
 
@@ -2918,7 +2795,7 @@ msgstr "Ціле число"
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr "Колір"
 
@@ -3056,86 +2933,86 @@ msgstr "Шведська"
 msgid "Chinese (Ch)"
 msgstr "Китайська (Ch)"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "Мова перевірки правопису"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "З'єднання недоступне"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше повідомлення не може бути відправлене до встановлення з'єднання."
 
-#: ../src/chat_control.py:861
+#: ../src/chat_control.py:885
 msgid "Underline"
 msgstr "Підкреслити"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 msgid "Strike"
 msgstr "Перекреслити"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 msgid "Font"
 msgstr "Шрифт"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 msgid "Clear formating"
 msgstr "Зняти форматування"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr "Справді надіслати файл?"
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, 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:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 msgid "GPG encryption enabled"
 msgstr "Шифрування GPG увімкнено"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "Немає у реєстрі"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 msgid "This contact does not support file transfer."
 msgstr "Цей контакт не підтримує передавання файлів."
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr "Ви маєте знати справжній JID контакту, щоб надсилати йому чи їй файл."
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr "Немає ключа GPG"
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3143,50 +3020,50 @@ msgstr ""
 "З цим контактом не пов’язано жодного ключа GPG. Отже ви не зможете шифрувати "
 "повідомлення за допомогою GPG."
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 msgid "GPG encryption disabled"
 msgstr "Шифрування GPG вимкнено"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr "Сеанс БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr "Сеанс НЕ БУДЕ записано до журналу"
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr "є"
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr "НЕ є"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr "буде"
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr "НЕ буде"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 msgid "and authenticated"
 msgstr "і уповноваженим"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3195,23 +3072,23 @@ msgstr ""
 "Шифрування %(type)s %(status)s активним %(authenticated)s.\n"
 "Ваш сеанс балачки %(logged)s записано до журналу."
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr "Встановлення сеансу було скасовано"
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 msgid "This session is encrypted"
 msgstr "Цей сеанс зашифровано"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr " і БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr " і НЕ БУДЕ записано до журналу"
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3219,25 +3096,25 @@ msgstr ""
 "Особу віддаленого контакту не було перевірено. Натисніть кнопку з щитом, щоб "
 "ознайомитися з подробицями."
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 msgid "E2E encryption disabled"
 msgstr "Шифрування E2E вимкнено"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 msgid "The following message was NOT encrypted"
 msgstr "Наступне повідомлення НЕ було зашифровано"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 msgid "The following message was encrypted"
 msgstr "Наступне повідомлення було зашифровано"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Ви щойно отримали нове повідомлення від «%s»"
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3245,15 +3122,15 @@ msgstr ""
 "Якщо ви закриєте вкладку, а журнал було вимкнено, це повідомлення буде "
 "втрачено."
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr "Помилка бази даних"
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3262,110 +3139,120 @@ msgstr ""
 "Не вдалося прочитати файл бази даних (%s). Спробуйте виправити або вилучити "
 "його (всі записи журналу буде втрачено)."
 
-#: ../src/chat_control.py:2784
+#: ../src/chat_control.py:2858
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s тепер %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "створення бази даних журналів"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "створення бази даних журналів"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s є файлом, а має бути каталогом"
 
-#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Зараз Gajim завершить роботу"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s є каталогом, а має бути файлом"
 
-#: ../src/common/check_paths.py:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "створення каталогу %s"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 msgid "Change status information"
 msgstr "Змінити відомості про стан"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 msgid "Change status"
 msgstr "Змінити стан"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr "Вказати тип присутності і опис"
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 msgid "Free for chat"
 msgstr "Вільний для балачки"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 msgid "Online"
 msgstr "В мережі"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr "Не буде довго"
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 msgid "Do not disturb"
 msgstr "Не турбувати"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr "Поза мережею — від’єднаний"
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 msgid "Presence description:"
 msgstr "Опис стану присутності:"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr "Стан було змінено."
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 msgid "Leave Groupchats"
 msgstr "Полишити групові балачки"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "%(nickname)s у %(room_jid)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 msgid "You have not joined a groupchat."
 msgstr "Ви не приєдналися до групової балачки."
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr "Оберіть групові балачки, які ви бажаєте полишити"
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 msgid "Groupchats"
 msgstr "Групові балачки"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 msgid "You left the following groupchats:"
 msgstr "Ви полишили такі групові балачки:"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 msgid "Forward unread messages"
 msgstr "Переспрямувати непрочитані повідомлення"
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr "Всі непрочитані повідомлення було переспрямовано."
 
@@ -3465,9 +3352,9 @@ msgstr ""
 "згорнуто."
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 msgid "default"
 msgstr "типовий"
 
@@ -3770,11 +3657,11 @@ msgstr ""
 "стан, якщо це повідомлення не буде порожнім, для кожного з контактів під "
 "іменем контакту у вікні реєстру."
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr "Визначає позицію аватару у реєстрі. Можливі значення: left і right"
 
-#: ../src/common/config.py:229
+#: ../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."
@@ -3783,7 +3670,7 @@ msgstr ""
 "записів контактів, чий аватар не було отримано під час попереднього сеансу, "
 "або контактів, чиї аватари вважатимуться застарілими."
 
-#: ../src/common/config.py:230
+#: ../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."
@@ -3792,7 +3679,7 @@ msgstr ""
 "рядок стану у балачках, коли контакт змінює свій стан і/або своє "
 "повідомлення про стан."
 
-#: ../src/common/config.py:231
+#: ../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 "
@@ -3807,30 +3694,30 @@ msgstr ""
 "до того, що Gajim виводитиме лише повідомлення про те, що «такий-то увійшов "
 "або полишив групову балачку»."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "Колір контактів, які тільки-но увійшли до мережі."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "Колір контактів, які тільки-но вийшли з мережі."
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 "Якщо цей параметр матиме значення «True», відновлені повідомлення буде "
 "показано меншим ніж типовий шрифтом."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "Не показувати аватар транспорту."
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "Не показувати реєстр на системній панелі задач."
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3840,7 +3727,7 @@ msgstr ""
 "GTK+ і PyGTK не старіші за 2.8, у разі наявності подій у черзі позначка "
 "вікна програми почне блимати (типова поведінка у більшості менеджерів вікон)."
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3851,7 +3738,7 @@ msgstr ""
 "«False», щоб вимкнути надсилання відомостей sha до сервера групової балачки."
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 msgid ""
 "Controls the window where new messages are placed.\n"
 "'always' - All messages are sent to a single window.\n"
@@ -3872,35 +3759,35 @@ msgstr ""
 "'pertype' — повідомлення буде розподілено за типом (наприклад, прості і "
 "групові балачки) між окремими вікнами."
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr ""
 "Якщо цей параметр матиме значення «False», ви не бачитимете аватарів у вікні "
 "балачки."
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr ""
 "Якщо цей параметр матиме значення «True», натискання клавіші escape "
 "закриватиме вкладку або вікно програми."
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 msgid "Hides the buttons in chat windows."
 msgstr "Ховає кнопки у вікнах балачки."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "Приховує підпис у вікні групової балачки"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "Ховає підпис у вікні балачки між двома особами"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Ховає список учасників групової балачки у вікні групової балачки."
 
-#: ../src/common/config.py:251
+#: ../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."
@@ -3908,16 +3795,16 @@ msgstr ""
 "У балачках, показувати псевдонім на початку рядка повідомлення, лише якщо це "
 "повідомлення не тої самої особи, якою було надіслано попереднє повідомлення."
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 "Відступ за використання об’єднання послідовних повідомлень від однієї особи."
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 msgid "Smooth scroll message in conversation window"
 msgstr "Плавне гортання повідомлень у вікні балачки"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
@@ -3925,13 +3812,13 @@ msgstr ""
 "Список кольорів, відокремлених символом «:», які буде використано для "
 "розфарбовування псевдонімів у групових балачках."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr ""
 "Ctrl-Tab переводить до наступної вкладки створення повідомлення, якщо немає "
 "непрочитаних."
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:257
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
@@ -3939,7 +3826,7 @@ msgstr ""
 "Чи слід показувати діалогове вікно підтвердження створення метаконтактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:258
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
@@ -3947,7 +3834,7 @@ msgstr ""
 "Чи слід показувати діалогове вікно підтвердження блокування контактів? "
 "Порожній рядок вказуватиме на те, що це діалогове вікно не слід показувати."
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
@@ -3956,7 +3843,7 @@ msgstr ""
 "статусів? Порожній рядок вказуватиме на те, що це діалогове вікно не слід "
 "показувати."
 
-#: ../src/common/config.py:259
+#: ../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 "
@@ -3967,7 +3854,7 @@ msgstr ""
 "облікового запису. БУДЬТЕ ОБЕРЕЖНІ за умови входу з від’ємним пріоритетом: у "
 "такому разі ви НЕ отримуватимете повідомлень від вашого сервера."
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
@@ -3975,7 +3862,7 @@ msgstr ""
 "Якщо цей параметр матиме значення «True», Gajim використовуватиме Gnome "
 "Keyring (за його наявності) для зберігання паролі облікових записів."
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
@@ -3984,7 +3871,7 @@ msgstr ""
 "торбинок KDE (якщо kwalletcli доступний) для зберігання паролів облікових "
 "записів."
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
@@ -3993,7 +3880,7 @@ msgstr ""
 "контактів у мережі і загальну кількість контактів у рядках облікових записів "
 "і груп."
 
-#: ../src/common/config.py:263
+#: ../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"
@@ -4002,7 +3889,7 @@ msgstr ""
 "непорожнє значення, вважати всі вхідні повідомлення повідомленнями вказано "
 "типу"
 
-#: ../src/common/config.py:264
+#: ../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."
@@ -4011,7 +3898,7 @@ msgstr ""
 "у ньому контакт, яким вам було надіслано останнє повідомлення, якщо вікно "
 "балачки ще не було відкрито."
 
-#: ../src/common/config.py:265
+#: ../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."
@@ -4020,11 +3907,11 @@ msgstr ""
 "позначками $$ і $$ на зображення за допомогою dvips після перетворення його "
 "на формулу, і показуватиме зображення у вікні балачки."
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr "Час відсутності активності потрібний для закриття вікна зміни стану."
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
@@ -4032,7 +3919,7 @@ msgstr ""
 "Максимальна кількість рядків, які буде показано протягом спілкування. "
 "Застарілі рядки понад вказане число вилучатимуться."
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
@@ -4041,13 +3928,13 @@ msgstr ""
 "сповіщення (notification-daemon) буде приєднано до піктограми у системному "
 "лотку."
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 "Оберіть інтервал між двома послідовними перевірками на відсутність "
 "активності."
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
@@ -4055,7 +3942,7 @@ msgstr ""
 "За допомогою цього параметра можна регулювати розмір формул latex. Більші "
 "значення відповідають більшим символам формул."
 
-#: ../src/common/config.py:271
+#: ../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)"
@@ -4063,7 +3950,7 @@ msgstr ""
 "Чинні схеми uri. «Справжніми» uri вважатимуться лише схеми вказані у списку. "
 "(mailto і xmpp обробляються окремо)"
 
-#: ../src/common/config.py:272
+#: ../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!"
@@ -4071,13 +3958,13 @@ msgstr ""
 "Запит повідомлень відсутності до усих відключених контактів при появі з ними "
 "зв’язку.  УВАГА: це призведе до відсилання великої кількості запитів."
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 "Якщо Істино, доповнення у групових балачках будуть схожі на автодоповнення "
 "командної оболонки."
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 msgid ""
 "When is self contact row displayed. Can be \"always\", \"when_other_resource"
 "\" or \"never\""
@@ -4085,7 +3972,23 @@ msgstr ""
 "Коли показувати запис власного контакту. Може бути \"завжди\", "
 "\"коли_інший_ресурс\" або \"ніколи\""
 
-#: ../src/common/config.py:286
+#: ../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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
@@ -4093,7 +3996,7 @@ msgstr ""
 "Пріоритет автоматично змінюватиметься залежно від вашого стану. Пріоритети "
 "визначаються за допомогою параметрів autopriority_*."
 
-#: ../src/common/config.py:294
+#: ../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"
@@ -4102,38 +4005,38 @@ msgstr ""
 "значення: online, chat, away, xa, dnd, invisible. ЗАУВАЖЕННЯ: цей параметр "
 "використовуватиметься, лише якщо вимкнено параметр restore_last_status"
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr "Якщо увімкнено, відновлювати попередній використаний стан."
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr "Якщо Істино, усі запити авторизації буде автоматично задоволено."
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr ""
 "Якщо цей параметр матиме значення «False», обліковий запис буде вимкнено та "
 "не буде відображатись у вікні реєстру."
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 "Якщо вимкнено, не підписувати повідомлення про присутність ключем GPG, "
 "навіть якщо GPG налаштовано для використання."
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr "Увімкнути шифрування ESession для цього облікового запису."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Чи має Gajim автоматично починати сеанс з шифруванням за можливості?"
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
@@ -4141,32 +4044,40 @@ msgstr ""
 "Впорядкований список відокремлених комами типів з’єднання, які має "
 "спробувати програма. Можливі значення: tls, ssl і plain"
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж надсилати пароль "
 "нешифрованим з’єднанням."
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 "Показувати діалогове вікно попередження, перш ніж користуватися стандартною "
 "бібліотекою SSL."
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+#, fuzzy
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+"Показувати діалогове вікно попередження, перш ніж надсилати пароль "
+"нешифрованим з’єднанням."
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr "Відокремлений пробілами список помилок ssl, які слід ігнорувати."
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr "Надсилання порожнього повідомлення після неактивності."
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr "Надсилання XMPP ехо після неактивності."
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 msgid ""
 "How many seconds to wait for the answer of ping alive packet before we try "
 "to reconnect."
@@ -4176,11 +4087,11 @@ msgstr ""
 "з’єднання."
 
 #. yes, no, ask
-#: ../src/common/config.py:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Обхідний прийом для Jabberd2"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4189,15 +4100,15 @@ msgstr ""
 "проксі сервери, визначення параметром file_transfer_proxies, для передавання "
 "файлів."
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr "Відповідати на запити щодо підтвердження отримання"
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr "Надіслані запити на підтвердження отримання"
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
@@ -4205,11 +4116,16 @@ msgstr ""
 "Під час налаштування сеансу з шифруванням, чи слід Gajim припускати, що ви "
 "бажаєте вести запис повідомлень?"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "Будь ласка, вкажіть дані контакту, який ви бажаєте додати"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Чи увімкнено OpenPGP для цього контакту?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4217,101 +4133,101 @@ msgstr ""
 "Чи має Gajim за можливості автоматично запускати шифрований сеанс "
 "спілкування з цим контактом?"
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "Мова, згідно правил якої відбуватиметься перевірка правопису слів"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "all або відокремлені пробілами стани"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'yes', 'no' або 'both'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'так', 'ні' або ''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "Скоро повернуся"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "Повернуся за декілька хвилин."
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "Їм"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "Зараз їм, залиште повідомлення, перегляну пізніше."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "Відео"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "Я дивлюся відео."
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "Працюю"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "Я працюю."
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "Я розмовляю телефоном."
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "Відійшов(шла)"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "Я насолоджуюся життям."
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "Я — доступний (доступна) для балачки."
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "Я — вільний (вільна) для балачки."
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "Скоро повернуся."
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "Я — недоступний (недоступна) для балачки."
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "Не турбувати."
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "Пока!"
 
-#: ../src/common/config.py:475
+#: ../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."
@@ -4320,101 +4236,93 @@ msgstr ""
 "зі слів, вказаних за допомогою параметра muc_highlight_words, або якщо "
 "повідомлення групової балачки містить ваш псевдонім."
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "Звук, який буде відтворено за появи повідомлення групової балачки."
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "зелений"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "овочевий"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "тілесний"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "морський"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "Не вдалося завантажити модуль перевірки відсутності активності"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "Вузол вказано помилково"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr "Некоректна локальна адреса? :-O"
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Відомості щодо реєстрації з транспорту %s не надійшли протягом визначеного "
 "проміжку часу"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 msgid "Registration succeeded"
 msgstr "Зареєструватися на %s"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Реєстрацію з агентом %s вдало закінчено"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 msgid "Registration failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, 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:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr "Помилка під час спроби запису на диск"
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 msgid "Invisibility not supported"
 msgstr "Невидимість не підтримується"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Обліковий запис %s не підтримує невидимості."
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 "Надійшло повідомлення від некоректного JID, це повідомлення було "
 "проігноровано."
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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."
@@ -4424,7 +4332,7 @@ msgstr ""
 "http://trac.gajim.org/wiki/DatabaseBackup) або вилучити його (всі журнали "
 "буде втрачено)."
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Заборонений псевдонім: %s"
@@ -4432,78 +4340,78 @@ msgstr "Заборонений псевдонім: %s"
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "Не вдалося приєднатися до групової балачки"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr "Максимальна кількість користувачів %s вже досягнута."
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Вас заблокували у груповій балачці %s."
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Групової балачки %s не існує."
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "Можливість створення групових балачок обмежено."
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr ""
 "Для групової балачки %s слід використовувати псевдонім, під яким ви "
 "зареєструвалися."
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Вас немає у списку постійних учасників групової балачки %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 msgid "Room has been destroyed"
 msgstr "Кімнату було знищено"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Ви можете приєднатися до цієї кімнати замість %s"
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "Я хочу додати вас до свого реєстру."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "тепер ми підписані на %s"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запит на скасування підписки від %s"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "підписку на %s скасовано"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4641,16 +4549,16 @@ msgstr "До призначення ключа не належить підпи�
 msgid "Application verification failure"
 msgstr "Помилка під час перевірки програми"
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, 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:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr "Не підписано повідомлення про присутність, ключа також не призначено."
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
@@ -4658,11 +4566,11 @@ msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:307
+#: ../src/common/connection.py:322
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Це повідомлення *зашифровано* (див. :XEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4671,81 +4579,81 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "З’єднання з обліковим записом «%s» було втрачено"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "Виконати повторне з’єднання вручну."
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Від сервера %(name)s було отримано помилкову відповідь на запит щодо "
 "реєстрації: %(error)s"
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "На сервері %s передбачено іншу форму реєстрації"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Невідома помилка SSL: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "Некоректна відповідь"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Транспорт %(name)s надіслав помилкову відповідь на запит щодо реєстрації: %"
 "(error)s"
 
-#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не вдалося з’єднатися з «%s»"
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "Перевірте ваше з’єднання, а потім повторіть спробу."
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, python-format
 msgid "Server replied: %s"
 msgstr "Збережено за адресою: %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 msgid "Connection to proxy failed"
 msgstr "Спроба встановити з'єднання з проксі-сервером завершилася невдало"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Не вдалося з’єднатися з обліковим записом %s"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr ""
 "З’єднання з обліковим записом було втрачено %s. Повторна спроба з’єднання."
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr "Достовірність сертифіката %s знаходиться під питанням."
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
@@ -4754,7 +4662,7 @@ msgstr ""
 "\n"
 "Помилка SSL: <b>%s</b>"
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, python-format
 msgid ""
 "\n"
@@ -4763,24 +4671,24 @@ msgstr ""
 "\n"
 "Невідома помилка SSL: %d"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "Перевірте ваше з’єднання або повторіть спробу пізніше"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Спроба розпізнавання за допомогою «%s» завершилася невдало"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "Будь ласка, перевірте, чи правильно вказано ім’я користувача і пароль."
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 msgid "Error while removing privacy list"
 msgstr "Помилка під час вилучення списку конфіденційності"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
@@ -4790,44 +4698,44 @@ msgstr ""
 "у одному з ресурсів, з яким з’єднано ваш клієнт. Вимкніть цей ресурс і "
 "повторіть спробу."
 
-#: ../src/common/connection.py:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr "Відправлений контакт:  \"%s\" (%s)"
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 msgid "Sent contacts:"
 msgstr "Надіслати контакти:"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "Не отримано через стан невидимості"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 msgid "Unregister failed"
 msgstr "Спроба скасування реєстрації завершилася невдало"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 "Видалення реєстрації з серверу %(server)s не вдалося через помилку: %(error)s"
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "Спостерігачі"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "Транспорти"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 msgid "Not in roster"
 msgstr "Немає у реєстрі"
 
@@ -4836,38 +4744,54 @@ msgstr "Немає у реєстрі"
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "У системі не знайдено прив’язок D-Bus-python"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 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:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr "D-Bus не працює коректно на цій машині."
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr ""
-"Не знайдено пакунка pysqlite2 (або python-pysqlite2). Завершення роботи..."
+#: ../src/common/dbus_support.py:54
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: system bus not present"
+msgstr "D-Bus не працює коректно на цій машині."
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/dbus_support.py:57
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "D-Bus не працює коректно на цій машині."
+
+#: ../src/common/exceptions.py:45
 msgid "Database cannot be read."
 msgstr "Не вдалося прочитати базу даних."
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr ""
 "Служба недоступна: Gajim не запущено або встановлено значення «False» для "
 "параметра remote_control"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "У цій системі немає D-Bus або відсутній потрібний модуль python"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr ""
+"Шина сеансів недоступна.\n"
+"Спробуйте ознайомитися з вмістом сторінки http://trac.gajim.org/wiki/"
+"GajimDBus"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "Шина сеансів недоступна.\n"
 "Спробуйте ознайомитися з вмістом сторінки http://trac.gajim.org/wiki/"
@@ -5036,206 +4960,206 @@ msgstr "Кінець тижня"
 msgid "Weekend!"
 msgstr "Вихідні!"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "Некоректний символ у імені користувача."
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "Слід вказати адресу сервера."
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "Некоректний символ у назві вузла."
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "Некоректний символ у назві ресурсу."
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "_Зайнятий"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "Зайнятий"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "_Не доступний"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "_Вільний для балачки"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "Вільний для балачки"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "_Доступний"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "Доступний"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "Виконується з'єднання"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "В_ідійшов"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "_Поза мережею"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "Поза мережею"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "_Невидимий"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "Невідомий"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "З помилками"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "Немає"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "До"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "Обидва"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "Немає"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "Підписатися"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "Немає"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "Модератори"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "Модератор"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "Учасники"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "Учасник"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "Відвідувачі"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "Відвідувач"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "Немає"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "Власник"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "Адміністратор"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "Учасник"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "спілкується"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "робить щось інше"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 msgid "is composing a message..."
 msgstr "пише повідомлення..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "призупинив (призупинила) створення повідомлення"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "закрив (закрила) вікно або вкладку балачки"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s ГіБ"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s ГБ"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s МіБ"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s МБ"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s кіБ"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s кБ"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s Б"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
@@ -5243,22 +5167,22 @@ msgstr[0] "у черзі %d повідомлення"
 msgstr[1] "у черзі %d повідомлення"
 msgstr[2] "у черзі %d повідомлень"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, python-format
 msgid " from room %s"
 msgstr " з кімнати %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, python-format
 msgid " from user %s"
 msgstr " від користувача %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, python-format
 msgid " from %s"
 msgstr " від %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
@@ -5266,12 +5190,49 @@ msgstr[0] "у черзі %d подія"
 msgstr[1] "у черзі %d події"
 msgstr[2] "у черзі %d подій"
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "Налаштування кімнати"
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Помилка під час виконання «%(command)s»: %(error)s"
@@ -5281,17 +5242,74 @@ msgstr "Помилка під час виконання «%(command)s»: %(error
 msgid "%s is not a valid loglevel"
 msgstr "%s не є коректним рівнем журналювання"
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "Типове повідомлення"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "Розмір: %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "помилка: не вдалося відкрити %s для читання"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "блакитний"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 msgid "migrating logs database to indices"
 msgstr "перехід від бази даних журналів до покажчика"
 
@@ -5928,19 +5946,19 @@ msgstr "Вчуся"
 msgid "Writing"
 msgstr "Пишу"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr "Невідомий виконавець"
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr "Невідома назва"
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr "Невідоме джерело"
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5950,12 +5968,12 @@ msgstr ""
 "з <i>%(source)s</i>"
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:91
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "Не вдалося прив’язатися до порту %s."
 
-#: ../src/common/socks5.py:87
+#: ../src/common/socks5.py:92
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
 "cancelled."
@@ -5963,7 +5981,7 @@ msgstr ""
 "Можливо, запущено інший екземпляр Gajim. Передавання файла буде скасовано."
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6035,24 +6053,20 @@ msgstr ""
 msgid "Error while adding service. %s"
 msgstr "Помилка під час додавання служби. %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "Вимкнено"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 msgid "Default Message"
 msgstr "Типове повідомлення"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 msgid "Enabled"
 msgstr "Увімкнено"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Словники для мови %s не доступні"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6061,76 +6075,76 @@ msgstr ""
 "Ви маєте встановити словники %s для використання перевірки орфографії, або "
 "обрати іншу мову через параметр speller_language."
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "заголовок повідомлення про стан"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "текст повідомлення про стан"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "Назва"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "Повторно увійти зараз?"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr ""
 "Якщо ви бажаєте, щоб всі зміни негайно набули чинності, вам слід вийти з "
 "облікового запису, а потім знову туди увійти."
 
-#: ../src/config.py:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 msgid "OpenPGP is not usable on this computer"
 msgstr "На цьому комп'ютері OpenPGP не придатне для використання"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "Непрочитані події"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr ""
 "Перш ніж вилучати цей обліковий запис, прочитайте усі повідомлення з черги "
 "подій."
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Ви розпочали балачку за допомогою облікового запису %s"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr ""
 "Всі вікна балачок і групових балачок буде закрито. Бажаєте продовжити "
 "процедуру виходу?"
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "Зараз ваш клієнт з’єднано з сервером"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 "Для зміни назви облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 msgid "To change the account name, you must read all pending events."
 msgstr ""
 "Для зміни назви облікового запису вам слід прочитати усі повідомлення з "
 "черги подій."
 
-#: ../src/config.py:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "Така назва облікового запису вже використовується"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
@@ -6138,148 +6152,148 @@ msgstr ""
 "Ви вже створили обліковий запис з такою назвою. Будь ласка, оберіть іншу "
 "назву."
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "Некоректна назва облікового запису"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "Назва облікового запису не може бути порожньою."
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "Назва облікового запису не може містити пробіли."
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 msgid "Rename Account"
 msgstr "Перейменувати запис"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Введіть нову назву для облікового запису %s"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ідентифікатор Jabber слід вказувати як «користувач@назва.сервера»."
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "Некоректний запис"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "Нетиповий порти слід вказувати у вигляді номера."
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "Спроба отримання закритих ключів завершилася невдало"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 msgid "There is no OpenPGP secret key available."
 msgstr "Немає доступних закритих ключів OpenPGP."
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "Вибір ключа OpenPGP"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "Оберіть свій ключ OpenPGP"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "Вказаний обліковий запис недоступний"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Вам слід створити обліковий запис, перш ніж розпочати редагування ваших "
 "особистих відомостей."
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "Ваш комп’ютер не з’єднано з сервером"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Без з’єднання ви не зможете редагувати ваші особисті відомості."
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "Ваш сервер не підтримує Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "Ваш сервер не може зберігати ваші особисті відомості."
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 msgid "To disable the account, you must be disconnected."
 msgstr ""
 "Для відключення облікового запису вам слід від’єднати клієнт від сервера."
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "Обліковий запис Local вже існує."
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr ""
 "Будь ласка, перейменуйте або вилучіть його, перш ніж вмикати локальні "
 "повідомлення."
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "Редагувати %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "Зареєструватися на %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "Список заборон"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "Список учасників"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "Список власників"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "Список адміністраторів"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "Підстава"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "Прізвисько"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "Роль"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "Блокування..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6287,11 +6301,11 @@ msgstr ""
 "<b>Кого ви бажаєте заблокувати?</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "Додавання учасника..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6299,11 +6313,11 @@ msgstr ""
 "<b>Кому ви бажаєте надати можливість участі?</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "Додавання власника..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6311,11 +6325,11 @@ msgstr ""
 "<b>Кого ви бажаєте зробити власником?</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "Додавання адміністратора..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6323,7 +6337,7 @@ msgstr ""
 "<b>Кого ви бажаєте зробити адміністратором?</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
@@ -6339,85 +6353,113 @@ msgstr ""
 "4. домен (пошук лише домену: записів користувач@домен,\n"
 "домен/ресурс або адреси, що містить піддомен)."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "Вилучення облікового запису %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "Емоційки вимкнено"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "Слід ввести пароль"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введіть ваш пароль для облікового запису %s"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "Зберегти пароль"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Обліковий запис «%s» з’єднано з сервером"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "Якщо ви вилучите його, з’єднання буде розірвано."
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "Спроба встановити з'єднання з проксі-сервером завершилася невдало"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "Що ви хочете зробити?"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "Вилучити обліковий запис _лише з Gajim"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "Типовий"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "Всі"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "Лише вхід і вихід"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 msgid "?print_status:None"
 msgstr "Жодного"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "Створити групову балачку"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "У цій закладці містяться некоректні дані"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Будь ласка, заповніть поля сервера і кімнати або вилучіть цю закладку."
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 msgid "Invalid nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 msgid "Character not allowed"
 msgstr "Заборонений символ"
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 msgid "Invalid server"
 msgstr "Некоректний сервер"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 msgid "Invalid room"
 msgstr "Некоректна кімната"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "Обліковий запис було успішно додано"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../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 "
@@ -6427,35 +6469,35 @@ msgstr ""
 "«Додатково». Пізніше ви можете виконати ті самі дії з налаштування вибором "
 "пункту «Облікові записи» у меню «Правка» головного вікна програми."
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "Ваш новий обліковий запис було успішно створено"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "Некоректне ім’я користувача"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Щоб налаштувати цей обліковий запис, вам слід вказати ім’я користувача."
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 msgid "Please provide a server on which you want to register."
 msgstr ""
 "Будь ласка, вкажіть назву сервера, на якому ви бажаєте зареєструватися."
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 msgid "Certificate Already in File"
 msgstr "Сертифікат вже наявний у файлі"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 "Цей сертифікат вже існує у файлі %s, програма не буде додавати його ще раз."
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6470,7 +6512,7 @@ msgstr ""
 "Помилка SSL: %(error)s\n"
 "Ви все ще бажаєте з’єднатися з цим сервером?"
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6481,59 +6523,59 @@ msgstr ""
 "Відбиток SHA1 сертифіката:\n"
 "%s"
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 msgid "An error occurred during account creation"
 msgstr "Під час спроби створення облікового запису сталася помилка"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "Цю назву облікового запису вже використано"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "У вас вже є обліковий запис з такою назвою."
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "Активний"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "Подія"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "Перше отримане повідомлення"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 msgid "Next Message Received Focused"
 msgstr "Фокус на наступне отримане повідомлення"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 msgid "Next Message Received Unfocused"
 msgstr "Зняття фокусу з наступного отриманого повідомлення"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "Контакт з'єднано"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "Контакт від'єднано"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "Повідомлення надіслано"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "Виділення повідомлення групової балачки"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "Отримано повідомлення групової балачки"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "Отримано електронного листа GMail "
 
@@ -6555,44 +6597,44 @@ msgstr ""
 "Текст під цим рядком відповідає повідомленням, які було\n"
 "надіслано з часу, коли ви востаннє зазирали до цього вікна групової балачки"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 msgid "_Quote"
 msgstr "_Цитата"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Дії для «%s»"
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "Прочитати статтю у В_ікіпедії"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "Пошукати це у _словнику"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "У адресі URL для пошуку у Тенетах не вказано «%s»"
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "Пошук у _Тенетах"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "Відкрити як _посилання"
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
@@ -6601,7 +6643,7 @@ msgstr[1] "Вчора"
 msgstr[2] "Вчора"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -6709,72 +6751,72 @@ msgstr ""
 "Будь ласка, вкажіть дані контакту, який ви бажаєте додати до облікового "
 "запису %s"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Будь ласка, вкажіть дані контакту, який ви бажаєте додати"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "Некоректний ідентифікатор користувача"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "У ідентифікаторі користувача не повинно міститися назви ресурсу."
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 msgid "You cannot add yourself to your roster."
 msgstr "Ви не можете додавати себе ж до реєстру."
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "Цей контакт вже є у реєстрі"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "Цей контакт уже є у вашому реєстрі."
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "Ідентифікатор:"
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "Клієнт Jabber на GTK+"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "Версія GTK+:"
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "Версія PyGTK:"
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "Поточні розробники:"
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "Колишні розробники:"
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "ПОДЯКИ:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr "Raven's fans <translation@linux.org.ua>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6787,109 +6829,109 @@ msgstr ""
 "\n"
 "Можливість підсвічування неправильно написаних слів буде поки що вимкнено"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 msgid "The nickname has not allowed characters."
 msgstr "У псевдонімі є недозволені символи."
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Запит на підписку до облікового запису %(account)s від %(jid)s"
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запит на підписку від %s"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Ви вже берете участь у груповій балачці %s"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Вам слід з’єднати ваш обліковий запис, щоб взяти участь у груповій балачці."
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Приєднатися до групової балачки з облікового запису %s"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 msgid "Invalid Account"
 msgstr "Некоректний обліковий запис"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr ""
 "Ви маєте обрати обліковий запис, з якого ви бажаєте приєднатись до групової "
 "балачки."
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2312
 msgid "Invalid Nickname"
 msgstr "Некоректний псевдонім"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "Некоректний ідентифікатор Jabber групової балачки"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr ""
 "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr ""
 "У ідентифікаторі Jabber групової балачки містяться недозволені символи."
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "Це не групова балачка"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s не є назвою групової балачки."
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr ""
 "Для синхронізації ваших контактів потрібно встановити з’єднання облікового "
 "запису з сервером."
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 msgid "This account is not connected to the server"
 msgstr "Цей обліковий запис не з’єднано з сервером"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr ""
 "Можливістю синхронізації можна скористатися, лише якщо обліковий запис "
 "з’єднано з сервером."
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr "Синхронізувати"
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Почати балачку з облікового запису %s"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "Почати балачку"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6898,173 +6940,171 @@ msgstr ""
 "бажаєте надіслати повідомлення балачки:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "З’єднання недоступне"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Будь ласка, переконайтеся, що клієнт з’єднано з «%s»."
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "Некоректний JID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Не вдалося обробити «%s»."
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "До встановлення з’єднання ви не зможете змінити ваш пароль."
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "Некоректний пароль"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "Вам слід ввести пароль."
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "Паролі не збігаються"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролі, введені у обидва поля, мають бути тотожними."
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "Контакт увійшов до мережі"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "Контакт вийшов з мережі"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "Нове повідомлення"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "Створити окреме повідомлення"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "Нове конфіденційне повідомлення"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "Нове повідомлення електронної пошти"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "Запит на передавання файла"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "Помилка під час передавання файла"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "Завершення передавання файла"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "Зупинка передавання файла"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "Запрошення до групової балачки"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "Зміна контактом стану"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Окреме повідомлення з використанням облікового запису %s"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Окреме повідомлення для облікового запису %s"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "Окреме повідомлення"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "Надіслати %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "Отримано %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "Відповідь: %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написав(-ла):\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "Консоль XML для %s"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr "Консоль XML"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "Сумний"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "Змінити"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "В_илучити"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7072,152 +7112,152 @@ msgid ""
 msgstr "<b>%s</b> бажає додати вас до <b>%s</b> контактів у своєму реєстрі."
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "Додати"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 msgid "Modify"
 msgstr "Змінити"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "Вилучити"
+
+#: ../src/dialogs.py:3204
 msgid "Jabber ID"
 msgstr "Jabber ID:"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 msgid "Groups"
 msgstr "Групи"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "%s підказав мені додати вас до мого реєстру."
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "Дод_ати контакт"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "Вилучає контакт з реєстру"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Списки конфіденційності <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, 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:3294
+#: ../src/dialogs.py:3487
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Порядок: %(order)s, дія: %(action)s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Редагувати правило</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>Додати правило</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Списки приватності для %s"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "Списки конфіденційності"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "Некоректна назва списку"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "Для створення списку конфіденційності вам слід ввести його назву."
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 msgid "You are invited to a groupchat"
 msgstr "Вас запрошено до групової балачки"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact запросив вас до участі у обговоренні"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact запросив вас до групової балачки %(room_jid)s"
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr "Чи бажаєте ви прийняти це запрошення?"
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "Обрати звук"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "Всі файли"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Звуки wav"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "Вибрати зображення"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "Зображення"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "Якщо %s стане рівним:"
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Додавання особливого сповіщення для %s"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "№"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "Умова"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "якщо я "
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7228,19 +7268,19 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання (SAS) цього сеансу є <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr "Ви вже перевіряли особу контакту."
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr "Особу контакту перевірено"
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr "Повторити перевірку..."
 
-#: ../src/dialogs.py:4564
+#: ../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 "
@@ -7250,19 +7290,19 @@ msgstr ""
 "бажана особа, і що ця лише ця особа матиме змогу надсилати вам повідомлення, "
 "вам слід підтвердити їх ідентичність натисканням кнопки, розташованої нижче."
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr "Особу контакту НЕ перевірено"
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr "Перевірити..."
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr "Чи перевірили ви особу контакту?"
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7277,24 +7317,24 @@ msgstr ""
 "\n"
 "Коротким рядком розпізнавання у цьому сеансі буде <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr "Ви зв’язалися з контактом і перевірили SAS?"
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, 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:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/dialogs.py:4635
+#: ../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."
@@ -7303,7 +7343,7 @@ msgstr ""
 "b>, отже повідомлення <b>не може</b> бути зашифрованим. Для того, щоб "
 "встановити надійність цього ключа, скористайтесь вашим клієнтом GPG."
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
@@ -7311,53 +7351,53 @@ msgstr ""
 "З цим контактом пов’язано ключ GPG, ви вважаєте цей ключ надійним, отже "
 "повідомлення буде зашифровано."
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "Інші"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "Конференція"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 "Для того, щоб переглядати доступні служби, вам слід встановити з’єднання"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Пошук служб за допомогою облікового запису %s"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "Пошук у службі"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "Не вдалося знайти службу"
 
-#: ../src/disco.py:707
+#: ../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."
@@ -7365,94 +7405,98 @@ msgstr ""
 "За вказаною вами адресою служб не виявлено, або ця адреса не відповідає. "
 "Перевірте, чи правильно вказано адресу, а потім повторіть спробу."
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "Служба не придатна для перегляду"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "Служби такого типу не містять елементів, які можна було б переглядати."
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 msgid "Invalid Server Name"
 msgstr "Некоректна назва сервера"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Перегляд %(address)s з використанням облікового запису %(account)s"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "_Перегляд"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "Ця служба не містить жодних елементів, які можна було б переглядати."
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 msgid "_Execute Command"
 msgstr "Ви_конати команду"
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "За_реєструватися"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Пошук %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "Користувачі"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "Опис"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Ідентифікатор"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+msgid "_Bookmark"
+msgstr "_Закладка"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "Закладку вже встановлено"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "Закладка на груповій балачці «%s» вже існує."
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "Закладку було успішно додано"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 "Керувати вашими закладками можна за допомогою меню дій у вашому реєстрі."
 
-#: ../src/disco.py:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "Підписано"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 msgid "Node"
 msgstr "Вузол"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "Нове повідомлення"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "_Підписатися"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "_Скасувати підписку"
 
@@ -7504,7 +7548,7 @@ msgstr "Потрібен python-dbus."
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr "Цією можливістю не можна скористатися у Windows."
 
@@ -7673,104 +7717,90 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr "Потрібні python-docutils."
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr "Банери та активні посилання"
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-"Можливість користуватися натисканням адрес URL у підписах вікон балачки і "
-"групової балачки."
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr "Потрібен python-sexy."
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 #, fuzzy
 msgid "Requires python-farsight."
 msgstr "Потрібен python-avahi."
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 msgid "Feature"
 msgstr "Можливість"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "Файл"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "Час"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "Поступ"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "Назва файла: %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "Розмір: %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "Ви"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "Відправник: %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "Отримувач:"
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "Збережено за адресою: %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "Передавання файла завершено"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "В_ідкриту теку, яка містить цей файл"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 msgid "File transfer cancelled"
 msgstr "Передавання файла скасовано"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "Не вдалося встановити з’єднання з вузлом."
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "Отримувач: %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "Повідомлення про помилку: %s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 msgid "File transfer stopped"
 msgstr "Зупинка передавання файла"
 
@@ -7778,7 +7808,7 @@ msgstr "Зупинка передавання файла"
 msgid "Choose File to Send..."
 msgstr "Вибрати файл для надсилання..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 msgid "Description: "
 msgstr "Опис: "
 
@@ -7810,34 +7840,34 @@ msgstr "Опис: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s бажає надіслати вам файл:"
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Не вдалося перезаписати існуючий файл «%s»"
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr ""
 "Файл з такою назвою вже існує, у вас немає дозволів для його перезапису."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "Файл з такою назвою вже існує."
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Запис до каталогу «%s» неможливий"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "Ваш користувач не має права на створення файлів у цьому каталозі."
 
@@ -7873,75 +7903,59 @@ msgstr "Файл: "
 msgid "It is not possible to send empty files"
 msgstr "Надсилання порожніх файлів не передбачено"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "Назва: "
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "Відправник:"
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "Призупинити"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "_Продовжити"
+
+#: ../src/gajim.py:141
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Для роботи Gajim потрібен запущений сервер X. Завершення роботи..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr "імпорт PyGTK не вдався: %s"
 
-#: ../src/gajim.py:180
-msgid "Gajim needs PyGTK 2.12 or above"
+#: ../src/gajim.py:183
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Для роботи Gajim потрібен PyGTK 2.12 або новіша версія"
 
-#: ../src/gajim.py:181
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:184
+#, fuzzy
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібен PyGTK 2.12 або новіша версія. Завершення роботи..."
 
-#: ../src/gajim.py:183
-msgid "Gajim needs GTK 2.12 or above"
+#: ../src/gajim.py:186
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Для роботи Gajim потрібна бібліотека GTK 2.12 або новіша версія"
 
-#: ../src/gajim.py:184
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+#: ../src/gajim.py:187
+#, fuzzy
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr ""
 "Для запуску Gajim потрібна бібліотека GTK 2.12 або новіша версія. Завершення "
 "роботи..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "У середовищі виконання GTK+ відсутня підтримка libglade"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr ""
-"Будь ласка, вилучіть поточні бібліотеки GTK+ з системи і встановіть останню "
-"стабільну версію цих бібліотек, яку можна знайти за адресою %s"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr ""
-"Будь ласка, перевірте, чи увімкнено підтримку libglade у GTK+ і PyGTK на "
-"вашій системі."
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "Для запуску Gajim потрібен PySQLite2"
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Для роботи Gajim потрібен pywin32"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7951,11 +7965,11 @@ msgstr ""
 "Звантажити цю програму можна за адресою %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim вже запущено"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7999,8 +8013,8 @@ msgstr ""
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "обліковий запис"
 
@@ -8022,12 +8036,15 @@ msgid "status"
 msgstr "стан"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "одне зі значень: offline, online, chat, away, xa, dnd, invisible "
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "повідомлення"
 
@@ -8268,70 +8285,89 @@ 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:277
 msgid "Handle a xmpp:/ uri"
 msgstr "Обробка xmpp:/ uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr "uri"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr "Адреса URI для обробки"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr "Обліковий запис, який має це обробляти"
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 msgid "Message content"
 msgstr "Вміст повідомлення"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 msgid "Join a MUC room"
 msgstr "Приєднатися до кімнати групової балачки"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "room"
 msgstr "кімната"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 msgid "Room JID"
 msgstr "JID кімнати"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "nick"
 msgstr "псевдонім"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 msgid "Nickname to use"
 msgstr "Псевдонім, який слід використовувати"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "password"
 msgstr "пароль"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 msgid "Password to enter the room"
 msgstr "Пароль для входу до кімнати"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr "Обліковий запис, з якого ви бажаєте увійти до кімнати"
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 msgid "Check if Gajim is running"
 msgstr "Перевірити, чи запущено Gajim"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 msgid "Shows or hides the ipython window"
 msgstr "Показує або ховає вікно ipython"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущено аргумент «contact_jid»"
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8340,16 +8376,16 @@ msgstr ""
 "«%s» немає у реєстрі.\n"
 "Будь ласка, вкажіть обліковий запис для надсилання цього повідомлення."
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "У вас немає жодного задіяного облікового запису"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Здається, Gajim не запущено. Отже ви не зможете скористатися gajim-remote."
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8358,16 +8394,16 @@ msgstr ""
 "Використання: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "Аргументи:"
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr "%s не знайдено"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8376,7 +8412,7 @@ msgstr ""
 "Використання: %s команда [аргументи]\n"
 "Можливі команди:\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8385,7 +8421,7 @@ msgstr ""
 "Забагато аргументів. \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8394,7 +8430,11 @@ msgstr ""
 "Не було вказано аргумент \"%(arg)s\". \n"
 "Виконайте команду \"%(basename)s help %(command)s\", щоб дізнатися більше"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 msgid "Wrong uri"
 msgstr "Помилкова адреса uri"
 
@@ -8423,175 +8463,176 @@ msgstr "Ви не можете вилучати вашої поточної те
 msgid "Please first choose another for your current theme."
 msgstr "Будь ласка, спершу змініть тему на іншу."
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "Спроба надсилання конфіденційного повідомлення зазнала невдачі"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "Вставити псевдонім"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 msgid "Conversation with "
 msgstr "Спілкування з"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 msgid "Continued conversation"
 msgstr "Спілкування з продовженням"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 msgid "Any occupant is allowed to see your full JID"
 msgstr "Всі учасники можуть бачити ваш JID повністю"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr "Увімкнено запис кімнати"
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 msgid "A new room has been created"
 msgstr "Було створено нову кімнату"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr "Сервер призначив вам псевдонім у кімнаті або змінив цей псевдонім"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s було викинуто: %(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s було заблоковано: %(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s було заблоковано %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "Ви тепер відомі як %s"
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s тепер стає %(new_nick)s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s було вилучено з кімнати (%(reason)s)"
 
-#: ../src/groupchat_control.py:1327
+#: ../src/groupchat_control.py:1312
 msgid "affiliation changed"
 msgstr "змінено місце роботи"
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr "налаштування кімнати змінено на «лише для постійних учасників»"
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr "вимкнення системи"
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, 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:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr "** Належність of %(nick)s було встановлено у значення %(affiliation)s"
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Роль %(nick)s було встановлено у значення %(role)s"
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr "%s вийшов"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s приєднався до групової балачки"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 тепер %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Ви справді бажаєте полишити групову балачку «%s»?"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1690
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "Якщо ви закриєте це вікно, вас буде від’єднано від групової балачки."
 
-#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "Більше _не питати мене"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "Зміна теми"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "Будь ласка, вкажіть нову тему:"
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "Зміна псевдоніма"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "Будь ласка, вкажіть новий псевдонім, яким ви бажаєте скористатися:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, python-format
 msgid "Destroying %s"
 msgstr "Знищення %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
@@ -8599,22 +8640,22 @@ msgstr ""
 "Ви маєте намір знищити цю кімнату.\n"
 "Нижче ви можете вказати причину цього рішення:"
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr "Ви також можете вказати альтернативне місце зустрічі:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "Викидання %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "Нижче ви можете зазначити причину:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "Блокування %s"
@@ -8634,61 +8675,61 @@ msgstr ""
 msgid "_Report Bug"
 msgstr "_Повідомити про помилку"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "Подробиці"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Помилка: не вдалося відкрити %s для читання"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "Помилка під час спроби прочитати файл:"
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 msgid "Error parsing file:"
 msgstr "Помилка під час обробки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim не є типовим клієнтом Jabber"
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Чи бажаєте ви зробити Gajim типовим клієнтом Jabber?"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Завжди перевіряти, чи є Gajim типовим клієнтом Jabber, під час запуску"
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "Додаток не підтримується"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "Зберегти зображення як..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8699,58 +8740,58 @@ msgstr ""
 "використовує інший учасник.\n"
 "Будь ласка, вкажіть нижче інший псевдонім:"
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr "Завжди використовувати цей псевдонім при виникненні конфліктів."
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "Чи приймаєте ви цей запит?"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Чи приймаєте ви запит щодо облікового запису %s?"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s) уповноваження для %(url)s (ідентифікатор: %(id)s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "Спроба з’єднання завершилася невдало"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "помилка під час надсилання %(message)s ( %(error)s )"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 msgid "Subscription request"
 msgstr "Запит на підписку"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "Уповноваження прийнято"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контакт «%s» уповноважив вас на перегляд свого стану."
 
-#: ../src/gui_interface.py:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт «%s» вилучив вашу підписку"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -8758,60 +8799,60 @@ msgstr ""
 "Цей контакт завжди буде показано зі станом «поза мережею».\n"
 "Бажаєте вилучити контакт з вашого списку контактів?"
 
-#: ../src/gui_interface.py:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 msgid "Unsubscribed"
 msgstr "_Непідписаний"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Зв’язок з «%s» встановити не вдалося"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s встановив тему %(subject)s"
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr "Тепер у кімнаті буде показано недоступних постійних учасників"
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr "тепер у кімнаті не можна буде бачити недоступних постійних учасників"
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr "Тепер увімкнено запис повідомлень кімнати"
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr "Тепер запис кімнати вимкнено"
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr "Тепер у кімнаті вимкнено анонімність"
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr "Тепер у кімнаті увімкнено напіванонімність"
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr "Тепер у кімнаті увімкнено анонімність"
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr ""
 "Для приєднання до кімнати %s потрібен пароль. Будь ласка, введіть його."
 
-#: ../src/gui_interface.py:1137
+#: ../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"
@@ -8819,23 +8860,23 @@ msgstr ""
 "Ви налаштували Gajim на використання агента GPG, але агент GPG не запущено "
 "або цей агент повернув помилковий пароль.\n"
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Ви виконали з’єднання без вашого ключа OpenPGP."
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "Ваш пароль не є коректним"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "Ваш OpenPGP пароль не є коректним"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr "GPG непридатне для використання"
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
@@ -8843,20 +8884,21 @@ msgstr ""
 "З цим контактом не пов’язано жодних ключів GPG. Отже шифрування повідомлень "
 "буде неможливим."
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
+#, fuzzy
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly 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\t\t\tнеправильно)"
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Нові повідомлення у %(gmail_mail_address)s"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
@@ -8864,7 +8906,7 @@ msgstr[0] "Отримано %d новий лист"
 msgstr[1] "Отримано %d нових листи"
 msgstr[2] "Отримано %d нових листів"
 
-#: ../src/gui_interface.py:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8879,42 +8921,42 @@ msgstr ""
 "Тема: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s бажає надіслати вам файл."
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 msgid "Remote contact stopped transfer"
 msgstr "Віддалений контакт зупинив передавання файлу"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 msgid "Error opening file"
 msgstr "Помилка під час спроби прочитати файл"
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Ви успішно отримали %(filename)s від %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1454
+#: ../src/gui_interface.py:1479
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передавання файлу·%(filename)s·від·%(name)s·зупинено."
 
-#: ../src/gui_interface.py:1467
+#: ../src/gui_interface.py:1492
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Ви успішно надіслали %(filename)s до %(name)s."
 
 #. ft stopped
-#: ../src/gui_interface.py:1471
+#: ../src/gui_interface.py:1496
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Надсилання файлу %(filename)s до %(name)s зупинено"
 
-#: ../src/gui_interface.py:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
@@ -8923,38 +8965,38 @@ msgstr ""
 "Не вдалося розшифрувати повідомлення від %s\n"
 "Можливо, хтось втрутився у ваше з’єднання."
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 msgid "Unable to decrypt message"
 msgstr "Не вдалося розшифрувати повідомлення"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "Конфлікт імен користувачів"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr ""
 "Будь ласка, введіть нове ім'я користувача для вашого локального облікового "
 "запису"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr "Гу?"
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Га! (%s s.)"
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr "Помилка."
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 msgid "Resource Conflict"
 msgstr "Конфлікт ресурсів"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
@@ -8962,21 +9004,22 @@ msgstr ""
 "Ваш клієнт вже з’єднано з цим обліковим записом і тим самим ресурсом. Будь "
 "ласка, вкажіть інший ресурс"
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s бажає надіслати вам файл."
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "Запит на передавання файла"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr "Помилка під час перевірки сертифіката SSL"
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8987,15 +9030,15 @@ msgstr ""
 "помилка: %(error)s\n"
 "Ви все ще маєте намір з’єднатися з сервером?"
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr "Ігнорувати цю помилку для цього сертифіката."
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr "Помилка сертифіката SSL"
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -9012,23 +9055,28 @@ msgstr ""
 "\n"
 "Ви все ще маєте намір з’єднатися і оновити відбиток сертифіката?"
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 msgid "Insecure connection"
 msgstr "Небезпечне з’єднання"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
+#, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr "Так, я справді бажаю знехтувати безпекою"
 
-#: ../src/gui_interface.py:1972
+#: ../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?"
@@ -9037,27 +9085,36 @@ msgstr ""
 "безпеку з’єднання, вам слід встановити PyOpenSSL. Виконати надсилання пароля "
 "зараз?"
 
-#: ../src/gui_interface.py:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+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"
 msgstr "Вузол повідомлення про стан було вилучено"
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr "Вузол повідомлення про стан %(node)s було вилучено: %(message)s"
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 msgid "Emoticons disabled"
 msgstr "Емоційки вимкнено"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr "Вказаної вами теми емоційок не було знайдено, емоційки буде вимкнено."
 
-#: ../src/gui_interface.py:2570
+#: ../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 "
@@ -9067,40 +9124,40 @@ msgstr ""
 "формат файла emoticons.py. Докладніше про новий формат можна дізнатися за "
 "адресою http://trac.gajim.org/wiki/Emoticons."
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "Не вдалося зберегти ваші налаштування і параметри"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "Слід вказати пароль"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "Введіть пароль ключа GPG для ключа %(keyid)s (account %(account)s)."
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr "Немає ключа GPG"
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "З’єднання з %s буде встановлено без OpenPGP."
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "Вказано помилковий пароль"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Будь ласка, введіть ще раз свій пароль GPG або натисніть кнопку «Скасувати»."
@@ -9109,37 +9166,37 @@ msgstr ""
 msgid "_New Group Chat"
 msgstr "_Створити групову балачку"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "Я хочу додати вас до свого реєстру"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "Не можу знайти базу даних журналу"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "Контакти"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "Дата"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "Псевдонім"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "Повідомлення"
 
-#: ../src/history_manager.py:248
+#: ../src/history_manager.py:241
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
@@ -9147,7 +9204,7 @@ msgstr ""
 "Бажаєте спорожнити базу даних? (НАПОЛЕГЛИВО НЕ РЕКОМЕНДУЄМО ЦЬОГО РОБИТИ, "
 "ЯКЩО ЗАПУЩЕНО GAJIM)"
 
-#: ../src/history_manager.py:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9162,27 +9219,27 @@ msgstr ""
 "\n"
 "Якщо ви натиснете кнопку «ТАК», вам доведеться зачекати..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "Експорт журналів..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s %(time)s повідомив: %(message)s\n"
 
-#: ../src/history_manager.py:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "Наслідки цієї дії є незворотними."
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Ви справді бажаєте вилучити виділене повідомлення?"
@@ -9222,35 +9279,35 @@ msgstr "Поточний стан: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Поточний стан: %(status)s"
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 msgid "Timeout loading image"
 msgstr "Перевищення часу очікування під час завантаження зображення"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr "Зображення є завеликим"
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 msgid "You are going to close several tabs"
 msgstr "Ви збираєтесь закрити кілька вкладок"
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 msgid "Do you really want to close them all?"
 msgstr "Ви справді бажаєте закритити їх усі?"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "Балачки"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "Групові балачки"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "Конфіденційні балачки"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "Повідомлення"
 
@@ -9262,22 +9319,22 @@ msgstr "- вестиметься запис повідомлень"
 msgid "- messages will not be logged"
 msgstr "- не вестиметься запис повідомлень"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s змінив стан"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s в мережі"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s вийшов з мережі"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Нове окреме повідомлення від %(nickname)s"
@@ -9302,7 +9359,7 @@ msgstr "Повідомлення надіслано від імені %(nickname
 msgid "New Message from %(nickname)s"
 msgstr "Нове повідомлення від %(nickname)s"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 msgid "Ignore"
 msgstr "_Ігнорувати"
 
@@ -9310,18 +9367,18 @@ msgstr "_Ігнорувати"
 msgid "Retrieving profile..."
 msgstr "Отримання профілю..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 msgid "File is empty"
 msgstr "Файл порожній"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 msgid "File does not exist"
 msgstr "Файла не існує"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "Не вдалося завантажити зображення"
 
@@ -9354,51 +9411,51 @@ msgid ""
 msgstr ""
 "Під час спроби оприлюднення ваших особистих відомостей, спробуйте пізніше."
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "Об’єднані облікові записи"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "Було надіслано уповноваження"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Тепер «%s» буде відомий ваш стан."
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "Було надіслано запит на підписку"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Якщо «%s» прийме цей запит, ви дізнаватиметеся про його або її стан."
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "Уповноваження було вилучено"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Тепер «%s» завжди бачитиме вас як «поза мережею»."
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr "GPG непридатне для використання"
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "З’єднання з %s буде встановлено без OpenPGP."
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "Ви берете участь у одній або декількох групових балачках"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
@@ -9406,27 +9463,38 @@ msgstr ""
 "Зміна стану на «невидимий» призведе до вашого виходу з наведених групових "
 "балачок. Ви справді бажаєте змінити стан на «невидимий»?"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr "розсинхронізація"
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr "Справді вийти з Gajim?"
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 msgid "Are you sure you want to quit Gajim?"
 msgstr "Ви справді бажаєте вийти з Gajim?"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr "Завжди закривати Gajim"
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "Скасувати передавання файла"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "У вас є непрочитані повідомлення"
 
-#: ../src/roster_window.py:2334
+#: ../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."
@@ -9434,16 +9502,16 @@ msgstr ""
 "Доступ для читання повідомлень буде можливим, лише якщо ви увімкнули журнал, "
 "а контакт наявний у вашому реєстрі."
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "Вам слід прочитати їх, перш ніж вилучати цей транспорт."
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" буде вилучено"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
@@ -9451,11 +9519,11 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цього транспорту."
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "Транспорти буде вилучено"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9464,11 +9532,11 @@ msgstr ""
 "Ви більше не зможете надсилати і отримувати повідомлення від контактів за "
 "допомогою цих транспортів: %s"
 
-#: ../src/roster_window.py:2653
+#: ../src/roster_window.py:2731
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2733
 msgid ""
 "This contact will see you offline and you will not receive messages he will "
 "send you."
@@ -9477,56 +9545,56 @@ msgstr ""
 "від нього повідомлень."
 
 #. it's jid
-#: ../src/roster_window.py:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "Перейменувати контакт"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Введіть новий псевдонім для контакту %s"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "Перейменувати групу"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Введіть нову назву для групи %s"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "Вилучити групу"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Бажаєте вилучити групу %s з реєстру?"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Крім того, вилучити всі контакти з цієї групи з вашого реєстру"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "Призначити ключ OpenPGP"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "Оберіть ключ для використання з цим контактом"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт «%s» буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, 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:3217
+#: ../src/roster_window.py:3310
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9535,11 +9603,11 @@ msgstr ""
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3223
+#: ../src/roster_window.py:3316
 msgid "Do you want to continue?"
 msgstr "Бажаєте продовжити виконання операції?"
 
-#: ../src/roster_window.py:3226
+#: ../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."
@@ -9547,16 +9615,16 @@ msgstr ""
 "Вилучення цього контакту призведе до вилучення уповноваження, отже він або "
 "вона не зможуть визначати, коли ви перебуватимете у мережі."
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу, щоб цей контакт знав про мій стан після вилучення"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "Контакти буде вилучено з вашого реєстру"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9566,35 +9634,36 @@ msgstr ""
 "призведе до вилучення уповноваження, отже для них ви завжди залишатиметеся "
 "поза мережею."
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
+#, 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:3297
-#, python-format
+#: ../src/roster_window.py:3392
+#, fuzzy, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 "Цей контакт тимчасово бачитиме вас як %(status)s, но лише до зміни вашого "
 "статусу. Потім він бачитиме ваш глобальний статус."
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "Немає жодного облікового запису"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Перш ніж ви зможете розпочати балачку з контактами, вам слід створити "
 "обліковий запис."
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "Збереження метаконтактів не підтримується вашим сервером"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9602,12 +9671,12 @@ msgstr ""
 "Ваш сервер не підтримує збереження відомостей щодо метаконтактів. Отже ці "
 "відомості не буде збережено до наступного з’єднання."
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "Ви маєте намір створити метаконтакт. Ви справді цього бажаєте?"
 
-#: ../src/roster_window.py:3986
+#: ../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 "
@@ -9617,11 +9686,11 @@ msgstr ""
 "списку. Загалом кажучи, метаконтакти використовуються, якщо вашим контактом "
 "є особа з декількома обліковими записами або транспортами Jabber."
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 msgid "Invalid file URI:"
 msgstr "Некоректна адреса файла:"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
@@ -9629,12 +9698,12 @@ msgstr[0] "Ви справді бажаєте надіслати цей файл
 msgstr[1] "Ви справді бажаєте надіслати ці файли до %s:"
 msgstr[2] "Ви справді бажаєте надіслати ці файли до %s:"
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, python-format
 msgid "Send %s to %s"
 msgstr "Надіслати %s до %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Робить %s та %s метаконтактом."
@@ -9644,126 +9713,130 @@ msgstr "Робить %s та %s метаконтактом."
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "з облікового запису %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "до облікового запису %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "з облікового запису %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "_Керування закладками..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "облікового запису %s"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "до облікового запису %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "_Змінити повідомлення про стан"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 msgid "Publish Tune"
 msgstr "Оприлюднити музику"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "Оприлюднити музику"
+
+#: ../src/roster_window.py:5104
 msgid "Configure Services..."
 msgstr "Налаштувати служби..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr "_Максимізувати всі"
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "Надіслати групове п_овідомлення"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "Усім користувачам"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "Усім користувачам на зв'язку"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 msgid "_Manage Contacts"
 msgstr "_Керування контактами"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "Редагувати _групи"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 msgid "Send Single Message"
 msgstr "Надіслати окреме повідомлення"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "Виконати команду..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 msgid "_Manage Transport"
 msgstr "_Керування транспортом"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 msgid "_Modify Transport"
 msgstr "_Змінити транспорт"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "Пере_йменувати"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr "_Максимізувати"
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 msgid "_Reconnect"
 msgstr "_Перез’єднати"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 msgid "_Disconnect"
 msgstr "_Роз'єднати"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "Керування журналом"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "_Приєднатись до нової групової балачки"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "Змінити повідомлення про стан..."
 
@@ -9794,13 +9867,13 @@ msgid "Confirm these session options"
 msgstr "Підтвердити параметри цих сеансів"
 
 #: ../src/session.py:431
-#, python-format
+#, fuzzy, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 "Віддалений клієнт бажає розпочати сеанс з такими можливостями:\n"
 "\n"
@@ -9823,116 +9896,126 @@ msgstr ""
 "\n"
 "Продовжити цей сеанс?"
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "_Змінити повідомлення про стан..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "у _реєстрі"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "Сховати це меню"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID: "
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "Ресурс"
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s цієї групової балачки"
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr " [заблоковано]"
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr " [мінімізовано]"
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "Стан: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "Попередній стан: %s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr " з %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 msgid "Connected"
 msgstr "З'єднано"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 msgid "Disconnected"
 msgstr "Роз'єднано"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "Підписка:"
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 msgid "Tune:"
 msgstr "Музика:"
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "Сповіщення"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "Звантажити"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "Вивантажити"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "Передано:"
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "Не розпочато"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "Зупинено"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "Призупинено"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "Заблоковано"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "Перенесення"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "Ця служба ще не надала докладних відомостей"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9940,28 +10023,28 @@ msgstr ""
 "Ця служба не може надсилати у відповідь докладні відомості.\n"
 "Причиною є застарілість або пошкодженість служби"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "Невідомий"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "Невідома"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 msgid "?Time:Unknown"
 msgstr "?Час:Невідомий"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "з %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Належність:</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9969,7 +10052,7 @@ msgstr ""
 "Цей контакт зацікавлений у ваших відомостях щодо присутності, але ви не "
 "цікавитеся відомостями щодо його або її присутності"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9977,32 +10060,389 @@ msgstr ""
 "Ви зацікавлені у відомостях щодо присутності контакту, але він або вона не "
 "цікавляться вашими відомостями"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Ви і цей контакт взаємно зацікавлені у відомостях щодо присутності одне "
 "одного"
 
 #. None
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Ви не зацікавлені у присутності контакту, а він або вона у вашій присутності"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Ви очікуєте на відповідь контакту на ваш запит щодо підписки"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr "У черзі немає запитів на підписку."
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr " пріоритетний ресурс"
 
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Приєднатись до _групової балачки"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "_Додати контакт..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "Ви_явити служби"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "_Виконати команду..."
+
+#~ msgid "_Modify Account"
+#~ msgstr "_Змінити обліковий запис"
+
+#~ msgid "_Personal Events"
+#~ msgstr "_Особисті події"
+
+#~ msgid "_Start Chat..."
+#~ msgstr "_Почати балачку..."
+
+#~ msgid "_Status"
+#~ msgstr "_Стан"
+
+#~ msgid "Account Modification"
+#~ msgstr "Зміна облікового запису"
+
+#~ msgid ""
+#~ "Check this so Gajim will connect in port 5223 where legacy servers are "
+#~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+#~ "default if broadcasted by the server, and with this option enabled TLS "
+#~ "will be disabled"
+#~ msgstr ""
+#~ "Позначте цей пункт, щоб Gajim використовував порт 5223 для з'єднання з "
+#~ "застарілими серверами, які, як очікує програма використовують SSL-"
+#~ "шифрування. Зауважте, що Gajim використовує TLS-шифрування, якщо не "
+#~ "вказано іншого. Якщо позначити цей пункт шифрування буде вимкнено TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "Редагувати особисті відомості..."
+
+#~ msgid "Hostname: "
+#~ msgstr "Назва вузла: "
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "Якщо буде позначено цей пункт, Gajim буде зберігати паролі у файлі ~/."
+#~ "gajim/config, доступ на запис до якого матимете лише ви"
+
+#~ msgid "Port: "
+#~ msgstr "Порт: "
+
+#~ msgid "Proxy:"
+#~ msgstr "Проксі:"
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "Зберегти _пароль (небезпечно)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "Надсилати пакети підтвердження дієздатності"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "Використовувати _SSL (застаріле)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "_Узгодити зі станом"
+
+#~ msgid "gtk-add"
+#~ msgstr "gtk-add"
+
+#~ msgid "gtk-close"
+#~ msgstr "gtk-close"
+
+#~ msgid "gtk-remove"
+#~ msgstr "gtk-remove"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "Вилучити «Повідомлення дня»"
+
+#~ msgid "_Send Server Message..."
+#~ msgstr "_Надіслати серверне повідомлення..."
+
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "Отримано повідомлення\n"
+#~ "Контакт від'єднався \n"
+#~ "Контакт змінив стан \n"
+#~ "Підсвічене повідомлення групової балачки \n"
+#~ "Отримано повідомлення групової балачки \n"
+#~ "Запит на передавання файла \n"
+#~ "Передавання файла почалось \n"
+#~ "Передавання файла закінчено"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "контакт(и)\n"
+#~ "група(и)\n"
+#~ "усі"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "Приєднатись до _групової балачки"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "_Копіювати JID/адресу електронної пошти"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "_Копіювати посилання"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "_Відкрити редактор поштових повідомлень"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "_Відкрити посилання у веб-переглядачі"
+
+#~ msgid "_Start Chat"
+#~ msgstr "_Почати балачку"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "Рядок облікового запису\n"
+#~ "Рядок групи\n"
+#~ "Рядок контакту\n"
+#~ "Заголовок балачки"
+
+#~ msgid "Change _Nickname..."
+#~ msgstr "Змінити _псевдонім..."
+
+#~ msgid "Change _Subject..."
+#~ msgstr "Змінити _тему..."
+
+#~ msgid "Configure _Room..."
+#~ msgstr "Налаштувати _кімнату..."
+
+#~ msgid "_Destroy Room"
+#~ msgstr "_Знищити кімнату"
+
+#~ msgid "_Manage Room"
+#~ msgstr "_Керування кімнатою"
+
+#~ msgid "Send _File"
+#~ msgstr "Надіслати _файл"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "_Додати до реєстру"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "_Надіслати конфіденційне повідомлення"
+
+#~ msgid ""
+#~ "Enter JID or Contact name\n"
+#~ "Groupchat Histories\n"
+#~ "All Chat Histories"
+#~ msgstr ""
+#~ "Введіть JID або ім’я контакту\n"
+#~ "Журнали групових балачок\n"
+#~ "Журнали всіх балачок"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "Керування обліковими записами"
+
+#~ msgid "gtk-delete"
+#~ msgstr "gtk-delete"
+
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "Додати цей контакт до реєстру (Ctrl+D)"
+
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "Зробити закладку на цій кімнаті (Ctrl+B)"
+
+#~ msgid "Browse the chat history (Ctrl+H)"
+#~ msgstr "Переглянути журнал балачки (Ctrl+H)"
+
+#~ msgid "Change the room's subject (Alt+T)"
+#~ msgstr "Змінити тему обговорення у кімнаті (Alt+T)"
+
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "Змінити ваш псевдонім (Ctrl+N)"
+
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "Запросити контакти до спілкування (Ctrl+G)"
+
+#~ msgid "Send a file (Ctrl+F)"
+#~ msgstr "Надіслати файл (Ctrl+F)"
+
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "Показати список емоційок (Alt+M)"
+
+#~ msgid "Show a list of formattings"
+#~ msgstr "Показати список інструментів форматування"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "Показати меню додаткових можливостей (Alt+A)"
+
+#~ msgid "Show the contact's profile (Ctrl+I)"
+#~ msgstr "Показати профіль контакту (Ctrl+I)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "Усі стани балачки\n"
+#~ "Лише введення повідомлень\n"
+#~ "Вимкнено"
+
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "Автоматично визначати під час запуску Gajim\n"
+#~ "Завжди використовувати типові програми GNOME\n"
+#~ "Завжди використовувати типові програми KDE\n"
+#~ "Завжди використовувати типові програми Xfce\n"
+#~ "Власний набір"
+
+#~ msgid ""
+#~ "Detached roster with detached chats\n"
+#~ "Detached roster with single chat\n"
+#~ "Single window for everything\n"
+#~ "Detached roster with chat grouped by account\n"
+#~ "Detached roster with chat grouped by type"
+#~ msgstr ""
+#~ "Виокремлений реєстр з виокремленими вікнами балачок\n"
+#~ "Виокремлений реєстр зі спільним вікном балачки\n"
+#~ "Спільне вікно для всіх елементів\n"
+#~ "Виокремлений реєстр з вікнами для кожного облікового запису\n"
+#~ "Виокремлений реєстр з вікнами балачок за типом"
+
+#~ msgid ""
+#~ "Pop it up\n"
+#~ "Notify me about it\n"
+#~ "Show only in roster"
+#~ msgstr ""
+#~ "Виринаюче сповіщення\n"
+#~ "Сповіщати мене про це\n"
+#~ "Просто показати у реєстрі"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "нічого\n"
+#~ "взаємно\n"
+#~ "від\n"
+#~ "до"
+
+#~ msgid "gtk-cancel"
+#~ msgstr "gtk-cancel"
+
+#~ msgid "Add _Contact..."
+#~ msgstr "Додати _контакт..."
+
+#~ msgid "Fea_tures"
+#~ msgstr "Мо_жливості"
+
+#~ msgid "File _Transfers"
+#~ msgstr "Передавання _файлів"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "Профіль, _аватар"
+
+#~ msgid "_Accounts"
+#~ msgstr "_Облікові записи"
+
+#~ msgid "_Contents"
+#~ msgstr "_Вміст"
+
+#~ msgid "_FAQ"
+#~ msgstr "_ЧаП"
+
+#~ msgid "_Preferences"
+#~ msgstr "_Параметри"
+
+#~ msgid "_Quit"
+#~ msgstr "Ви_йти"
+
+#~ msgid "_Send Single Message..."
+#~ msgstr "_Надіслати окреме повідомлення..."
+
+#~ msgid "Send Single _Message"
+#~ msgstr "Надіслати окреме _повідомлення"
+
+#~ msgid "Sta_tus"
+#~ msgstr "Ста_н"
+
+#~ msgid "_Group Chat"
+#~ msgstr "_Групова балачка"
+
+#~ msgid "Enable"
+#~ msgstr "Увімкнути"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "_Змінити обліковий запис..."
+
+#~ msgid "Wrong host"
+#~ msgstr "Вузол вказано помилково"
+
+#~ msgid "Invalid local address? :-O"
+#~ msgstr "Некоректна локальна адреса? :-O"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr ""
+#~ "Не знайдено пакунка pysqlite2 (або python-pysqlite2). Завершення роботи..."
+
+#~ msgid "Banners and clickable links"
+#~ msgstr "Банери та активні посилання"
+
+#~ msgid "Ability to have clickable URLs in chat and groupchat window banners."
+#~ msgstr ""
+#~ "Можливість користуватися натисканням адрес URL у підписах вікон балачки і "
+#~ "групової балачки."
+
+#~ msgid "Requires python-sexy."
+#~ msgstr "Потрібен python-sexy."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "У середовищі виконання GTK+ відсутня підтримка libglade"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr ""
+#~ "Будь ласка, вилучіть поточні бібліотеки GTK+ з системи і встановіть "
+#~ "останню стабільну версію цих бібліотек, яку можна знайти за адресою %s"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr ""
+#~ "Будь ласка, перевірте, чи увімкнено підтримку libglade у GTK+ і PyGTK на "
+#~ "вашій системі."
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "Для запуску Gajim потрібен PySQLite2"
+
 #~ msgid "_Incoming message:"
 #~ msgstr "_Вхідне повідомлення:"
 
@@ -10227,12 +10667,6 @@ msgstr " пріоритетний ресурс"
 #~ "%(title)s %(artist)s\n"
 #~ "з %(source)s"
 
-#~ msgid "Always use OS/X default applications"
-#~ msgstr "Завжди використовувати типові програми OS/X"
-
-#~ msgid "Custom"
-#~ msgstr "Нетиповий"
-
 #~ msgid "Generic"
 #~ msgstr "Загальні"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index eb2a800b2..241fb18de 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-25 22:20+0100\n"
+"POT-Creation-Date: 2010-03-19 11:27+0100\n"
 "PO-Revision-Date: 2009-08-20 00:07+0200\n"
 "Last-Translator: kangkang <kanger@gmail.com>\n"
 "Language-Team: sIyU <jabber@lzusiyu.org>\n"
@@ -20,63 +20,11 @@ msgstr ""
 "X-Poedit-Country: CHINA\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/gajim.desktop.in.in.h:1
-msgid "A GTK+ Jabber client"
-msgstr "一个 GTK+ 的 Jabber 客户端"
-
-#: ../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 即时消息客户端"
-
-#: ../data/glade/account_context_menu.glade.h:1
-#: ../data/glade/roster_window.glade.h:7
-#, fuzzy
-msgid "Join _Group Chat..."
-msgstr "加入群聊(_G)"
-
-#: ../data/glade/account_context_menu.glade.h:2
-msgid "_Add Contact..."
-msgstr "添加联系人(_A)..."
-
-#: ../data/glade/account_context_menu.glade.h:3
-#: ../data/glade/roster_window.glade.h:17
-msgid "_Discover Services"
-msgstr "发掘服务(_D)"
-
-#: ../data/glade/account_context_menu.glade.h:4
-msgid "_Execute Command..."
-msgstr "执行命令(_E)..."
-
-#: ../data/glade/account_context_menu.glade.h:5
-#, fuzzy
-msgid "_Modify Account"
-msgstr "修改帐户"
-
-#: ../data/glade/account_context_menu.glade.h:6
+#: ../data/gui/account_context_menu.ui.h:1
 msgid "_Open Gmail Inbox"
 msgstr "打开 Gmail 收件箱(_O)"
 
-#: ../data/glade/account_context_menu.glade.h:7
-#, fuzzy
-msgid "_Personal Events"
-msgstr "个人信息"
-
-#: ../data/glade/account_context_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:25
-#, fuzzy
-msgid "_Start Chat..."
-msgstr "开始聊天(_S)"
-
-#: ../data/glade/account_context_menu.glade.h:9
-#: ../data/glade/zeroconf_context_menu.glade.h:2
-msgid "_Status"
-msgstr "状态(_S)"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:1
+#: ../data/gui/account_creation_wizard_window.ui.h:1
 #, fuzzy
 msgid ""
 "<b>Connecting to server</b>\n"
@@ -87,83 +35,90 @@ msgstr ""
 "\n"
 "请等待..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:4
+#: ../data/gui/account_creation_wizard_window.ui.h:4
 msgid "<b>Please choose one of the options below:</b>"
 msgstr "<b>请选择一个选项</b>："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:5
+#: ../data/gui/account_creation_wizard_window.ui.h:5
 #, fuzzy
 msgid "<b>Please fill in the data for your existing account</b>"
 msgstr "<b>请填写您新同账户的数据</b>"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:6
+#: ../data/gui/account_creation_wizard_window.ui.h:6
 msgid "<b>Please select a server</b>"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:7
+#: ../data/gui/account_creation_wizard_window.ui.h:7
 msgid "@"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:8
+#: ../data/gui/account_creation_wizard_window.ui.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
 msgstr ""
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/gui/account_creation_wizard_window.ui.h:11
 #, fuzzy
 msgid "Anon_ymous authentication"
 msgstr "使用验证"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/gui/account_creation_wizard_window.ui.h:12
 msgid "Connect when I press Finish"
 msgstr "当我点击“结束”时连接"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/gui/account_creation_wizard_window.ui.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim： 帐户创建向导"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/gui/account_creation_wizard_window.ui.h:14
 #, fuzzy
 msgid "I already have an account I want to _use"
 msgstr "我已经拥有了一个帐户"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:15
 msgid "I want to _register for a new account"
 msgstr "我想注册一个新帐户(_R)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
-#: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:25
+#: ../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 "如果选定，Gajim 会记录本帐户密码"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
-#: ../data/glade/account_modification_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:17
 msgid "Manage..."
 msgstr "管理..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../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 "无"
+
+#: ../data/gui/account_creation_wizard_window.ui.h:19
 #, fuzzy
 msgid "Prox_y:"
 msgstr "代理服务器："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
-#: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/gui/account_creation_wizard_window.ui.h:20
+#: ../data/gui/accounts_window.ui.h:45
 msgid "Save pass_word"
 msgstr "保存密码(_W)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/gui/account_creation_wizard_window.ui.h:21
 msgid "Set my profile when I connect"
 msgstr "当连接上时设置我的模版"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:21
-#: ../data/glade/account_modification_window.glade.h:45
+#: ../data/gui/account_creation_wizard_window.ui.h:22
 msgid "Use custom hostname/port"
 msgstr "使用自定义主机名/端口号"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
+#: ../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."
@@ -171,178 +126,171 @@ msgstr ""
 "您需要一个帐户来连接\n"
 "Jabber 网络"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
-#: ../data/glade/roster_window.glade.h:15
+#: ../data/gui/account_creation_wizard_window.ui.h:25
+#: ../data/gui/roster_window.ui.h:9
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/gui/account_creation_wizard_window.ui.h:26
 msgid "_Finish"
 msgstr "完成(_F)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/gui/account_creation_wizard_window.ui.h:27
 #, fuzzy
 msgid "_Hostname:"
 msgstr "主机名："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/gui/account_creation_wizard_window.ui.h:28
+#: ../data/gui/accounts_window.ui.h:57
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J)："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
-#: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/gui/account_creation_wizard_window.ui.h:29
+#: ../data/gui/accounts_window.ui.h:59
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
+#: ../data/gui/account_creation_wizard_window.ui.h:30
 msgid "_Port:"
 msgstr "端口(_P)"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:30
+#: ../data/gui/account_creation_wizard_window.ui.h:31
 msgid "_Server:"
 msgstr "服务器(_S)："
 
-#: ../data/glade/account_modification_window.glade.h:1
-#: ../data/glade/accounts_window.glade.h:1
-#: ../data/glade/preferences_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:1 ../data/gui/preferences_window.ui.h:13
 msgid "<b>Miscellaneous</b>"
 msgstr "<b>杂项</b>"
 
-#: ../data/glade/account_modification_window.glade.h:2
-#: ../data/glade/accounts_window.glade.h:2
+#: ../data/gui/accounts_window.ui.h:2
 msgid "<b>OpenPGP</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/account_modification_window.glade.h:3
-#: ../data/glade/accounts_window.glade.h:3
+#: ../data/gui/accounts_window.ui.h:3
 msgid "<b>Personal Information</b>"
 msgstr "<b>个人信息</b>"
 
-#: ../data/glade/account_modification_window.glade.h:4
-#: ../data/glade/accounts_window.glade.h:6
-#: ../data/glade/join_groupchat_window.glade.h:1
+#: ../data/gui/accounts_window.ui.h:4
+#, fuzzy
+msgid "<b>Proxy</b>"
+msgstr "<b>属性</b>"
+
+#: ../data/gui/accounts_window.ui.h:5
+#, fuzzy
+msgid "A_djust to status"
+msgstr "调整状态(_A)"
+
+#: ../data/gui/accounts_window.ui.h:6 ../data/gui/join_groupchat_window.ui.h:1
 msgid "Account"
 msgstr "账户"
 
-#: ../data/glade/account_modification_window.glade.h:5
-msgid "Account Modification"
-msgstr "帐户修改"
+#: ../data/gui/accounts_window.ui.h:7
+msgid "Accounts"
+msgstr "帐户"
 
-#: ../data/glade/account_modification_window.glade.h:6
-#: ../data/glade/accounts_window.glade.h:8
+#: ../data/gui/accounts_window.ui.h:8
 #, fuzzy
 msgid "Administration operations"
 msgstr "管理员列表"
 
-#: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "使用验证"
+
+#: ../data/gui/accounts_window.ui.h:10
 #, fuzzy
 msgid "Auto-reconnect when connection is lost"
 msgstr "连接丢失后自动重新连接"
 
-#: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/gui/accounts_window.ui.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "Gajim 启动时连接(_O)"
 
-#: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/gui/accounts_window.ui.h:12
 msgid "Chan_ge Password"
 msgstr "更换密码(_G)"
 
-#: ../data/glade/account_modification_window.glade.h:10
+#: ../data/gui/accounts_window.ui.h:13
 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"
+"Check this so Gajim will ask you before sending your password over an "
+"insecure connection."
 msgstr ""
-"检查这里， Gajim 将连接代理服务器具有 SSL 能力的 5523 端口。注意， Gajim 使"
-"用 TLS 加密接受服务器广播，而使用该选项将禁用 TLS"
 
-#: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/gui/accounts_window.ui.h:14
 msgid "Choose _Key..."
 msgstr "选择您的 OpenPGP 钥匙(_K)..."
 
-#: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/gui/accounts_window.ui.h:15
 msgid "Click to change account's password"
 msgstr "点击变更帐户密码"
 
-#: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/gui/accounts_window.ui.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 
-#: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/gui/accounts_window.ui.h:17
+#, fuzzy
+msgid "Co_nnect on Gajim startup"
+msgstr "Gajim 启动时连接(_O)"
+
+#: ../data/gui/accounts_window.ui.h:18
 msgid "Connection"
 msgstr "连接"
 
-#: ../data/glade/account_modification_window.glade.h:15
-msgid "Edit Personal Information..."
-msgstr "编辑个人信息..."
+#: ../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 "姓："
 
 #. No configured account
-#: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:21
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1100
-#: ../src/common/helpers.py:1112 ../src/notify.py:560 ../src/notify.py:581
-#: ../src/notify.py:620 ../src/notify.py:632
+#: ../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/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:22
-#: ../data/glade/preferences_window.glade.h:52 ../src/common/contacts.py:135
-#: ../src/dialogs.py:111 ../src/dialogs.py:121 ../src/roster_window.py:2746
-#: ../src/roster_window.py:5268
+#: ../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 "常规"
 
-#: ../data/glade/account_modification_window.glade.h:18
-msgid "Hostname: "
-msgstr "主机名："
-
-#: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:23
+#: ../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 ""
 "如选定， Gajim 将广播除了你的 IP 外的更多 IP，文件传输将有较多机会可以工作。"
 
-#: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/gui/accounts_window.ui.h:24
+#, fuzzy
+msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
+msgstr "如果选定，Gajim 会记录本帐户密码"
+
+#: ../data/gui/accounts_window.ui.h:26
 #, fuzzy
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
 msgstr "如果选定，Gajim 会发送数据包防止超时造成的连接断开"
 
-#: ../data/glade/account_modification_window.glade.h:22
-msgid ""
-"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
-"permission only for you"
-msgstr ""
-"如果选定，Gajim 会以已读许可方式为您个人把密码保存在 ~/.gajim/config 文件中"
-
-#: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/gui/accounts_window.ui.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr "如果选定，Gajim 会在运行时使用本帐户自动连接 jabber"
 
-#: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:28
+#: ../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 "
@@ -351,47 +299,48 @@ msgstr ""
 "如果选定，改变全局状态(在名单窗口下方复选框中调节)就会相应地改变当前帐户的状"
 "态"
 
-#: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:31
+#: ../data/gui/accounts_window.ui.h:29
+msgid ""
+"If the default port that is used for incoming messages is unfitting for your "
+"setup you can select another one here.\n"
+"You might consider to change possible firewall settings."
+msgstr ""
+"如果用于接受消息的默认端口不适合您的设置您可以在这里选择另外一个。\n"
+"您可以考虑下改变现在的防火墙设置。"
+
+#: ../data/gui/accounts_window.ui.h:31
 msgid "Information about you, as stored in the server"
 msgstr "服务器中保存的关于您的信息"
 
-#: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1646
-#: ../src/config.py:2196
+#: ../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 ID"
+
+#: ../data/gui/accounts_window.ui.h:33
+#: ../data/gui/zeroconf_information_window.ui.h:5
+msgid "Last Name:"
+msgstr "名："
+
+#: ../data/gui/accounts_window.ui.h:34
+msgid "Mer_ge accounts"
+msgstr "合并帐户(_G)"
+
+#: ../data/gui/accounts_window.ui.h:35 ../src/config.py:1748
+#: ../src/config.py:2301
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
-#. None means no proxy profile selected
-#: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:37
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1158
-#: ../src/config.py:1261 ../src/config.py:1550 ../src/config.py:1555
-#: ../src/config.py:2103 ../src/config.py:2182 ../src/config.py:2195
-#: ../src/config.py:3396 ../src/config.py:3469 ../src/dialogs.py:308
-#: ../src/dialogs.py:310 ../src/dialogs.py:513 ../src/dialogs.py:526
-#: ../src/roster_window.py:2800 ../src/roster_window.py:2806
-#: ../src/roster_window.py:2811
-msgid "None"
-msgstr "无"
-
-#: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:38
-#: ../data/glade/profile_window.glade.h:36
+#: ../data/gui/accounts_window.ui.h:37 ../data/gui/profile_window.ui.h:35
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../data/glade/account_modification_window.glade.h:31
-msgid "Port: "
-msgstr "端口："
-
-#: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/gui/accounts_window.ui.h:38
 msgid "Priori_ty:"
 msgstr "优先级(_T):"
 
-#: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:40
+#: ../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 "
@@ -400,23 +349,21 @@ msgstr ""
 "优先级是当多个客户端使用同一帐户连接到服务器时， Jabber 决定事件响应对象的依"
 "据。"
 
-#: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:41
+#: ../data/gui/accounts_window.ui.h:40
 msgid "Priority will change automatically according to your status."
 msgstr "优先级将根据您的状态自动转换。"
 
-#: ../data/glade/account_modification_window.glade.h:35
-msgid "Proxy:"
-msgstr "代理服务器："
+#. Rename
+#: ../data/gui/accounts_window.ui.h:41 ../src/roster_window.py:5326
+msgid "Re_name"
+msgstr "重命名(_N)"
 
-#: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/gui/accounts_window.ui.h:42
 #, fuzzy
 msgid "Resour_ce:"
 msgstr "资源(_C)："
 
-#: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:44
+#: ../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 "
@@ -428,212 +375,99 @@ msgstr ""
 "分。您可以利用“家庭”和“工作”两个资源同时连接到服务器。拥有更高优先级的资源得"
 "到服务器的事件响应。"
 
-#: ../data/glade/account_modification_window.glade.h:38
-msgid "Save _passphrase (insecure)"
-msgstr "保存密文(_P)(不安全)"
-
-#: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/gui/accounts_window.ui.h:44
 msgid "Save conversation _logs for all contacts"
 msgstr "保存与所有联系人的聊天记录(_L)"
 
-#: ../data/glade/account_modification_window.glade.h:41
-msgid "Send keep-alive packets"
+#: ../data/gui/accounts_window.ui.h:46
+#, fuzzy
+msgid "Send _keep-alive packets"
 msgstr "发送防超时数据包"
 
-#: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/gui/accounts_window.ui.h:47
 msgid "Synch_ronize account status with global status"
 msgstr "将帐户状态与全局状态同步(_R)"
 
-#: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:50
-#: ../data/glade/synchronise_select_account_dialog.glade.h:2
-#, fuzzy
-msgid "Synchronise contacts"
-msgstr "显示离线联系人"
-
-#: ../data/glade/account_modification_window.glade.h:44
-msgid "Use _SSL (legacy)"
-msgstr "使用 SSL(_S) (优先)"
-
-#: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:54
-msgid "Use file transfer proxies"
-msgstr "使用文件传输代理服务器"
-
-#: ../data/glade/account_modification_window.glade.h:47
-msgid "_Adjust to status"
-msgstr "调整状态(_A)"
-
-#: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:13
-#, fuzzy
-msgid "_Name:"
-msgstr "名称(_N)："
-
-#: ../data/glade/accounts_window.glade.h:4
-#, fuzzy
-msgid "<b>Proxy</b>"
-msgstr "<b>属性</b>"
-
-#: ../data/glade/accounts_window.glade.h:5
-#, fuzzy
-msgid "A_djust to status"
-msgstr "调整状态(_A)"
-
-#: ../data/glade/accounts_window.glade.h:7
-msgid "Accounts"
-msgstr "帐户"
-
-#: ../data/glade/accounts_window.glade.h:9
-#, fuzzy
-msgid "Anonymous authentication"
-msgstr "使用验证"
-
-#: ../data/glade/accounts_window.glade.h:13
-msgid ""
-"Check this so Gajim will ask you before sending your password over an "
-"insecure connection."
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:17
-#, fuzzy
-msgid "Co_nnect on Gajim startup"
-msgstr "Gajim 启动时连接(_O)"
-
-#: ../data/glade/accounts_window.glade.h:19
-#: ../data/glade/zeroconf_information_window.glade.h:2
-msgid "E-Mail:"
-msgstr "E-Mail ："
-
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/zeroconf_information_window.glade.h:3
-msgid "First Name:"
-msgstr "姓："
-
-#: ../data/glade/accounts_window.glade.h:24
-#, fuzzy
-msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
-msgstr "如果选定，Gajim 会记录本帐户密码"
-
-#: ../data/glade/accounts_window.glade.h:29
-msgid ""
-"If the default port that is used for incoming messages is unfitting for your "
-"setup you can select another one here.\n"
-"You might consider to change possible firewall settings."
-msgstr ""
-"如果用于接受消息的默认端口不适合您的设置您可以在这里选择另外一个。\n"
-"您可以考虑下改变现在的防火墙设置。"
-
-#: ../data/glade/accounts_window.glade.h:32
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1673
-#: ../src/dialogs.py:830
-msgid "Jabber ID:"
-msgstr "Jabber ID"
-
-#: ../data/glade/accounts_window.glade.h:33
-#: ../data/glade/zeroconf_information_window.glade.h:5
-msgid "Last Name:"
-msgstr "名："
-
-#: ../data/glade/accounts_window.glade.h:34
-msgid "Mer_ge accounts"
-msgstr "合并帐户(_G)"
-
-#. Rename
-#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5219
-msgid "Re_name"
-msgstr "重命名(_N)"
-
-#: ../data/glade/accounts_window.glade.h:47
-#, fuzzy
-msgid "Send _keep-alive packets"
-msgstr "发送防超时数据包"
-
-#: ../data/glade/accounts_window.glade.h:49
+#: ../data/gui/accounts_window.ui.h:48
 #, fuzzy
 msgid "Synchroni_ze account status with global status"
 msgstr "将帐户状态与全局状态同步(_R)"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/gui/accounts_window.ui.h:49
+#: ../data/gui/synchronise_select_account_dialog.ui.h:2
+#, fuzzy
+msgid "Synchronise contacts"
+msgstr "显示离线联系人"
+
+#: ../data/gui/accounts_window.ui.h:50
 msgid "Use G_PG Agent"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/gui/accounts_window.ui.h:51
 #, fuzzy
 msgid "Use cust_om hostname/port"
 msgstr "使用自定义主机名/端口号"
 
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/gui/accounts_window.ui.h:52
 #, fuzzy
 msgid "Use cust_om port:"
 msgstr "使用自定义端口："
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/gui/accounts_window.ui.h:53
+msgid "Use file transfer proxies"
+msgstr "使用文件传输代理服务器"
+
+#: ../data/gui/accounts_window.ui.h:54
 #, fuzzy
 msgid "_Edit Personal Information..."
 msgstr "编辑个人信息..."
 
-#: ../data/glade/accounts_window.glade.h:56
+#. XML Console enable checkbutton
+#: ../data/gui/accounts_window.ui.h:55 ../data/gui/xml_console_window.ui.h:11
 #, fuzzy
 msgid "_Enable"
 msgstr "启用"
 
-#: ../data/glade/accounts_window.glade.h:57
+#: ../data/gui/accounts_window.ui.h:56
 #, fuzzy
 msgid "_Hostname: "
 msgstr "主机名："
 
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/gui/accounts_window.ui.h:58
 #, fuzzy
 msgid "_Manage..."
 msgstr "管理..."
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/gui/accounts_window.ui.h:60
 #, fuzzy
 msgid "_Port: "
 msgstr "端口(_P)"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/gui/accounts_window.ui.h:61
 msgid "_Warn before using an insecure connection"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/gui/accounts_window.ui.h:62
 msgid "_use HTTP__PROXY environment variable"
 msgstr ""
 
-#: ../data/glade/accounts_window.glade.h:64
-msgid "gtk-add"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:65
-#: ../data/glade/features_window.glade.h:4
-#: ../data/glade/manage_sounds_window.glade.h:1
-msgid "gtk-close"
-msgstr ""
-
-#: ../data/glade/accounts_window.glade.h:66
-msgid "gtk-remove"
-msgstr ""
-
-#: ../data/glade/add_new_contact_window.glade.h:1
+#: ../data/gui/add_new_contact_window.ui.h:1
 msgid "A_ccount:"
 msgstr "账户(_C)："
 
-#: ../data/glade/add_new_contact_window.glade.h:2
+#: ../data/gui/add_new_contact_window.ui.h:2
 msgid "A_llow this contact to view my status"
 msgstr "允许此联系人看到我的状态(_L)"
 
-#: ../data/glade/add_new_contact_window.glade.h:3
+#: ../data/gui/add_new_contact_window.ui.h:3
 msgid "Add New Contact"
 msgstr "添加联系人"
 
-#: ../data/glade/add_new_contact_window.glade.h:4
+#: ../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/glade/add_new_contact_window.glade.h:5
+#: ../data/gui/add_new_contact_window.ui.h:5
 #, fuzzy
 msgid ""
 "You have to register with this transport\n"
@@ -645,7 +479,7 @@ msgstr ""
 "以添加此协议的联系人。\n"
 "点击注册按钮处理。"
 
-#: ../data/glade/add_new_contact_window.glade.h:9
+#: ../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."
@@ -653,707 +487,758 @@ msgstr ""
 "您必须连接到代理以\n"
 "增加此协议的联系人。"
 
-#: ../data/glade/add_new_contact_window.glade.h:11
+#: ../data/gui/add_new_contact_window.ui.h:11
 msgid "_Group:"
 msgstr "群组(_G)："
 
-#: ../data/glade/add_new_contact_window.glade.h:12
+#: ../data/gui/add_new_contact_window.ui.h:12
 msgid "_Nickname:"
 msgstr "昵称(_N)："
 
-#: ../data/glade/add_new_contact_window.glade.h:13
+#: ../data/gui/add_new_contact_window.ui.h:13
 msgid "_Protocol:"
 msgstr "协议(_P)："
 
-#: ../data/glade/add_new_contact_window.glade.h:14
+#: ../data/gui/add_new_contact_window.ui.h:14
 msgid "_Register"
 msgstr "注册(_G)："
 
-#: ../data/glade/add_new_contact_window.glade.h:15
+#: ../data/gui/add_new_contact_window.ui.h:15
+#, fuzzy
+msgid "_Save subscription message"
+msgstr "认证(_S)"
+
+#: ../data/gui/add_new_contact_window.ui.h:16
 msgid "_User ID:"
 msgstr "用户 ID(_U):"
 
-#: ../data/glade/adhoc_commands_window.glade.h:1
+#: ../data/gui/adhoc_commands_window.ui.h:1
 #, fuzzy
 msgid "<b>An error has occurred:</b>"
 msgstr "发生了一个协议错误："
 
-#: ../data/glade/adhoc_commands_window.glade.h:2
+#: ../data/gui/adhoc_commands_window.ui.h:2
 msgid "<b>Choose command to execute:</b>"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:3
+#: ../data/gui/adhoc_commands_window.ui.h:3
 msgid "Ad-hoc Commands - Gajim"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:4
+#: ../data/gui/adhoc_commands_window.ui.h:4
 msgid "Check once more"
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:5
+#: ../data/gui/adhoc_commands_window.ui.h:5
 #, fuzzy
 msgid "Error description..."
 msgstr "描述"
 
-#: ../data/glade/adhoc_commands_window.glade.h:6
+#: ../data/gui/adhoc_commands_window.ui.h:6
 #, fuzzy
 msgid "Please wait while retrieving command list..."
 msgstr "请等待日志被移动..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:7
+#: ../data/gui/adhoc_commands_window.ui.h:7
 #, fuzzy
 msgid "Please wait while the command is sending..."
 msgstr "请等待日志被移动..."
 
-#: ../data/glade/adhoc_commands_window.glade.h:8
+#: ../data/gui/adhoc_commands_window.ui.h:8
 msgid "Please wait..."
 msgstr ""
 
-#: ../data/glade/adhoc_commands_window.glade.h:9
+#: ../data/gui/adhoc_commands_window.ui.h:9
 msgid "This jabber entity does not expose any commands."
 msgstr ""
 
-#: ../data/glade/advanced_configuration_window.glade.h:1
-#: ../data/glade/features_window.glade.h:1
+#: ../data/gui/advanced_configuration_window.ui.h:1
+#: ../data/gui/features_window.ui.h:1
 msgid "<b>Description</b>"
 msgstr "<b>描述</b>"
 
-#: ../data/glade/advanced_configuration_window.glade.h:2
+#: ../data/gui/advanced_configuration_window.ui.h:2
 #, fuzzy
 msgid "<b>NOTE:</b> You should restart Gajim for some settings to take effect"
 msgstr "<b>注意：</b>您必须重新启动 gajim 使设置生效"
 
-#: ../data/glade/advanced_configuration_window.glade.h:3
+#: ../data/gui/advanced_configuration_window.ui.h:3
 msgid "Advanced Configuration Editor"
 msgstr "高级设置编辑器"
 
-#: ../data/glade/advanced_configuration_window.glade.h:4
+#: ../data/gui/advanced_configuration_window.ui.h:4
 msgid "Filter:"
 msgstr "过滤器："
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:1
-msgid "Delete MOTD"
-msgstr "删除 MOTD"
-
-#: ../data/glade/advanced_menuitem_menu.glade.h:2
+#: ../data/gui/advanced_menuitem_menu.ui.h:1
 msgid "Deletes Message of the Day"
 msgstr "删除每日消息"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:3
+#: ../data/gui/advanced_menuitem_menu.ui.h:2
 #, fuzzy
 msgid "Edit _Privacy Lists..."
 msgstr "私人列表(_P)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:4
+#: ../data/gui/advanced_menuitem_menu.ui.h:3
 #, fuzzy
 msgid "Sends a message to users currently connected to this server"
 msgstr "发送消息至连接到当前服务器的用户"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:5
+#: ../data/gui/advanced_menuitem_menu.ui.h:4
 #, fuzzy
 msgid "Set MOTD..."
 msgstr "设定 MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:6
+#: ../data/gui/advanced_menuitem_menu.ui.h:5
 msgid "Sets Message of the Day"
 msgstr "设定每日消息"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:7
+#: ../data/gui/advanced_menuitem_menu.ui.h:6
 msgid "Show _XML Console"
 msgstr "显示 XML 控制台(_X)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:8
+#: ../data/gui/advanced_menuitem_menu.ui.h:7
 #, fuzzy
 msgid "Update MOTD..."
 msgstr "更新 MOTD"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:9
+#: ../data/gui/advanced_menuitem_menu.ui.h:8
 msgid "Updates Message of the Day"
 msgstr "更新每日消息"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:10
+#: ../data/gui/advanced_menuitem_menu.ui.h:9
 msgid "_Administrator"
 msgstr "管理员(_A)"
 
-#: ../data/glade/advanced_menuitem_menu.glade.h:11
-#, fuzzy
-msgid "_Send Server Message..."
-msgstr "发送服务器消息(_S)"
-
-#: ../data/glade/advanced_notifications_window.glade.h:1
+#: ../data/gui/advanced_notifications_window.ui.h:1
 msgid " a window/tab opened with that contact "
 msgstr "与此联系人打开的窗口/标签"
 
-#: ../data/glade/advanced_notifications_window.glade.h:2
+#: ../data/gui/advanced_notifications_window.ui.h:2
 msgid "<b>Actions</b>"
 msgstr "<b>动作</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:3
+#: ../data/gui/advanced_notifications_window.ui.h:3
 msgid "<b>Conditions</b>"
 msgstr "<b>条件</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:4
-#: ../data/glade/preferences_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:4
+#: ../data/gui/preferences_window.ui.h:17
 msgid "<b>Sounds</b>"
 msgstr "<b>声音</b>"
 
-#: ../data/glade/advanced_notifications_window.glade.h:5
+#: ../data/gui/advanced_notifications_window.ui.h:5
 msgid "Advanced Actions"
 msgstr "高级动作"
 
-#: ../data/glade/advanced_notifications_window.glade.h:6
+#: ../data/gui/advanced_notifications_window.ui.h:6
 msgid "Advanced Notifications Control"
 msgstr "高级通知控件设置"
 
-#: ../data/glade/advanced_notifications_window.glade.h:7
+#: ../data/gui/advanced_notifications_window.ui.h:7
 msgid "All statuses"
 msgstr "所有状态"
 
-#: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:219
+#: ../data/gui/advanced_notifications_window.ui.h:8
+#: ../src/common/commands.py:106 ../src/common/helpers.py:233
 msgid "Away"
 msgstr "离开"
 
-#: ../data/glade/advanced_notifications_window.glade.h:9
+#: ../data/gui/advanced_notifications_window.ui.h:9
 msgid "Busy "
 msgstr "忙碌"
 
-#: ../data/glade/advanced_notifications_window.glade.h:10
+#: ../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/glade/advanced_notifications_window.glade.h:11
+#: ../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/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:229
+#: ../data/gui/advanced_notifications_window.ui.h:19
+#: ../src/common/helpers.py:243
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../data/glade/advanced_notifications_window.glade.h:13
+#: ../data/gui/advanced_notifications_window.ui.h:20
 msgid "Launch a command"
 msgstr "启动命令"
 
-#: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:202
+#: ../data/gui/advanced_notifications_window.ui.h:21
+#: ../src/common/helpers.py:216
 msgid "Not Available"
 msgstr "不可用"
 
-#: ../data/glade/advanced_notifications_window.glade.h:15
+#: ../data/gui/advanced_notifications_window.ui.h:22
 msgid "One or more special statuses..."
 msgstr "一或多个指定的状态..."
 
-#: ../data/glade/advanced_notifications_window.glade.h:16
+#: ../data/gui/advanced_notifications_window.ui.h:23
 msgid "Online / Free For Chat"
 msgstr "在线/自由聊天"
 
-#: ../data/glade/advanced_notifications_window.glade.h:17
+#: ../data/gui/advanced_notifications_window.ui.h:24
 msgid "Play a sound"
 msgstr "播放声音"
 
-#: ../data/glade/advanced_notifications_window.glade.h:18
-#, fuzzy
-msgid ""
-"Receive a Message\n"
-"Contact Disconnected \n"
-"Contact Change Status \n"
-"Group Chat Message Highlight \n"
-"Group Chat Message Received \n"
-"File Transfer Request \n"
-"File Transfer Started \n"
-"File Transfer Finished"
-msgstr ""
-"接受消息\n"
-"联系人在线\n"
-"联系人离线\n"
-"联系人改变状态\n"
-"群聊消息高亮\n"
-"接收到群聊消息\n"
-"文件传输请求\n"
-"文件传输开始\n"
-"文件传输结束"
-
-#: ../data/glade/advanced_notifications_window.glade.h:26
+#: ../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/glade/advanced_notifications_window.glade.h:27
+#: ../data/gui/advanced_notifications_window.ui.h:27
 msgid ""
 "_Activate window manager's UrgencyHint to make chat window in taskbar flash"
 msgstr "激活窗口管理器事件提示使任务栏的聊天窗口闪烁(_A)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:28
+#: ../data/gui/advanced_notifications_window.ui.h:28
 msgid "_Disable auto opening chat window"
 msgstr "禁用自动打开聊天窗口(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:29
+#: ../data/gui/advanced_notifications_window.ui.h:29
 msgid "_Disable existing popup window"
 msgstr "禁用现有的弹出窗口(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:30
+#: ../data/gui/advanced_notifications_window.ui.h:30
 msgid "_Disable existing sound for this event"
 msgstr "禁用现有的此事件的声音(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:31
+#: ../data/gui/advanced_notifications_window.ui.h:31
 msgid "_Disable showing event in roster"
 msgstr "禁用在名单中显示事件(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:32
+#: ../data/gui/advanced_notifications_window.ui.h:32
 msgid "_Disable showing event in systray"
 msgstr "禁用在系统托盘显示事件(_D)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:33
+#: ../data/gui/advanced_notifications_window.ui.h:33
 msgid "_Inform me with a popup window"
 msgstr "使用弹出窗口通知(_I)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:34
+#: ../data/gui/advanced_notifications_window.ui.h:34
 msgid "_Open chat window with user"
 msgstr "与用户打开聊天窗口(_O)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:35
+#: ../data/gui/advanced_notifications_window.ui.h:35
 msgid "_Show event in roster"
 msgstr "在名单中显示事件(_S)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:36
+#: ../data/gui/advanced_notifications_window.ui.h:36
 msgid "_Show event in systray"
 msgstr "在系统托盘中显示事件(_S)"
 
-#: ../data/glade/advanced_notifications_window.glade.h:37
+#: ../data/gui/advanced_notifications_window.ui.h:37
 msgid "and I "
 msgstr "与我"
 
-#: ../data/glade/advanced_notifications_window.glade.h:38
-msgid ""
-"contact(s)\n"
-"group(s)\n"
-"everybody"
+#: ../data/gui/advanced_notifications_window.ui.h:38
+#, fuzzy
+msgid "contact(s)"
+msgstr "联系人"
+
+#: ../data/gui/advanced_notifications_window.ui.h:39
+msgid "everybody"
 msgstr ""
-"联系人\n"
-"组\n"
-"任何人"
 
-#: ../data/glade/advanced_notifications_window.glade.h:41
+#: ../data/gui/advanced_notifications_window.ui.h:40
 msgid "for "
 msgstr "为"
 
-#: ../data/glade/advanced_notifications_window.glade.h:42
+#: ../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/glade/atom_entry_window.glade.h:1
+#: ../data/gui/atom_entry_window.ui.h:1
 #, fuzzy
 msgid "Entry:"
 msgstr "国家："
 
-#: ../data/glade/atom_entry_window.glade.h:2
+#: ../data/gui/atom_entry_window.ui.h:2
 #, fuzzy
 msgid "Feed name:"
 msgstr "主题名称"
 
-#: ../data/glade/atom_entry_window.glade.h:3
+#: ../data/gui/atom_entry_window.ui.h:3
 #, fuzzy
 msgid "Last modified:"
 msgstr "名："
 
-#: ../data/glade/atom_entry_window.glade.h:4
+#: ../data/gui/atom_entry_window.ui.h:4
 #, fuzzy
 msgid "New entry received"
 msgstr "当新事件发生时"
 
-#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:124
+#: ../data/gui/atom_entry_window.ui.h:5 ../src/atom_window.py:124
 msgid "You have received new entry:"
 msgstr ""
 
-#: ../data/glade/blocked_contacts_window.glade.h:1
+#: ../data/gui/blocked_contacts_window.ui.h:1
 #, fuzzy
 msgid "Blocked Contacts"
 msgstr "联系人"
 
-#: ../data/glade/change_activity_dialog.glade.h:1
+#: ../data/gui/change_activity_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b> "
 msgstr "<b>预设状态消息</b>"
 
-#: ../data/glade/change_activity_dialog.glade.h:2
+#: ../data/gui/change_activity_dialog.ui.h:2
 msgid "Set Activity"
 msgstr ""
 
-#: ../data/glade/change_activity_dialog.glade.h:3
+#: ../data/gui/change_activity_dialog.ui.h:3
 msgid "Set an activity"
 msgstr ""
 
-#: ../data/glade/change_mood_dialog.glade.h:1
+#: ../data/gui/change_mood_dialog.ui.h:1
 #, fuzzy
 msgid "<b>Message:</b>"
 msgstr "<b>预设状态消息</b>"
 
-#: ../data/glade/change_mood_dialog.glade.h:2
+#: ../data/gui/change_mood_dialog.ui.h:2
 #, fuzzy
 msgid "<b>Mood:</b>"
 msgstr "<b>声音</b>"
 
-#: ../data/glade/change_password_dialog.glade.h:1
+#: ../data/gui/change_password_dialog.ui.h:1
 msgid "Change Password"
 msgstr "更换密码"
 
-#: ../data/glade/change_password_dialog.glade.h:2
+#: ../data/gui/change_password_dialog.ui.h:2
 msgid "Enter it again for confirmation:"
 msgstr "再次输入以确认："
 
-#: ../data/glade/change_password_dialog.glade.h:3
+#: ../data/gui/change_password_dialog.ui.h:3
 msgid "Enter new password:"
 msgstr "输入新密码"
 
-#: ../data/glade/change_status_message_dialog.glade.h:1
+#: ../data/gui/change_status_message_dialog.ui.h:1
 msgid "<b>Type your new status message</b>"
 msgstr "<b>键入新的状态消息</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:613
+#: ../data/gui/change_status_message_dialog.ui.h:2 ../src/tooltips.py:657
 #, fuzzy
 msgid "Activity:"
 msgstr "活动"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:608
+#: ../data/gui/change_status_message_dialog.ui.h:3 ../src/tooltips.py:652
 #, fuzzy
 msgid "Mood:"
 msgstr "房间："
 
-#: ../data/glade/change_status_message_dialog.glade.h:4
+#: ../data/gui/change_status_message_dialog.ui.h:4
 msgid "Preset messages:"
 msgstr "当前消息："
 
-#: ../data/glade/change_status_message_dialog.glade.h:5
+#: ../data/gui/change_status_message_dialog.ui.h:5
 msgid "Save as Preset..."
 msgstr "另存为..."
 
-#: ../data/glade/chat_context_menu.glade.h:1
-msgid "Join _Group Chat"
-msgstr "加入群聊(_G)"
+#. # means number
+#: ../data/gui/chat_control.ui.h:1 ../src/dialogs.py:4132
+msgid "#"
+msgstr "#"
 
-#: ../data/glade/chat_context_menu.glade.h:2
-#: ../data/glade/contact_context_menu.glade.h:16
-#, fuzzy
-msgid "_Add to Roster..."
-msgstr "添加至名单(_A)"
+#: ../data/gui/chat_control.ui.h:2
+msgid "*"
+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:4
+msgid "1"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:5
+msgid "2"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:3
-msgid "_Copy JID/Email Address"
-msgstr "复制 JID/电子邮件地址(_C)"
+#: ../data/gui/chat_control.ui.h:6
+msgid "3"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:4
-msgid "_Copy Link Location"
-msgstr "复制连接位置(_C)"
+#: ../data/gui/chat_control.ui.h:7
+msgid "4"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:5
-msgid "_Open Email Composer"
-msgstr "打开邮件编辑器(_O)"
+#: ../data/gui/chat_control.ui.h:8
+msgid "5"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:6
-msgid "_Open Link in Browser"
-msgstr "在浏览器中打开连接(_O)"
+#: ../data/gui/chat_control.ui.h:9
+msgid "6"
+msgstr ""
 
-#: ../data/glade/chat_context_menu.glade.h:7
-#: ../data/glade/subscription_request_popup_menu.glade.h:1
-#: ../data/glade/systray_context_menu.glade.h:7
-msgid "_Start Chat"
-msgstr "开始聊天(_S)"
+#: ../data/gui/chat_control.ui.h:10
+msgid "7"
+msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:1
+#: ../data/gui/chat_control.ui.h:11
+msgid "8"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:12
+msgid "9"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:13
+msgid "Mic volume:"
+msgstr ""
+
+#: ../data/gui/chat_control.ui.h:14
+msgid "Sound volume:"
+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:16 ../data/gui/groupchat_control.ui.h:2
+#: ../data/gui/xml_console_window.ui.h:16 ../src/filetransfers_window.py:266
+msgid "_Send"
+msgstr "发送(_S)"
+
+#: ../data/gui/chat_control.ui.h:17 ../data/gui/groupchat_control.ui.h:3
+msgid "label"
+msgstr ""
+
+#: ../data/gui/chat_to_muc_window.ui.h:1
 #, fuzzy
 msgid "In_vite"
 msgstr "邀请到(_V)"
 
-#: ../data/glade/chat_to_muc_window.glade.h:2
+#: ../data/gui/chat_to_muc_window.ui.h:2
 msgid "Invite Friends!"
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:3
+#: ../data/gui/chat_to_muc_window.ui.h:3
 #, fuzzy
 msgid "MUC server"
 msgstr "旁观者"
 
-#: ../data/glade/chat_to_muc_window.glade.h:4
+#: ../data/gui/chat_to_muc_window.ui.h:4
 msgid "Please select a MUC server."
 msgstr ""
 
-#: ../data/glade/chat_to_muc_window.glade.h:5
+#: ../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/glade/contact_context_menu.glade.h:1
+#: ../data/gui/contact_context_menu.ui.h:1
 msgid "A_sk to see his/her status"
 msgstr "要求查看他/她的状态(_S)"
 
-#: ../data/glade/contact_context_menu.glade.h:2
+#: ../data/gui/contact_context_menu.ui.h:2
 #, fuzzy
 msgid "Add Special _Notification..."
 msgstr "添加特殊提示(_N)"
 
-#: ../data/glade/contact_context_menu.glade.h:3
+#: ../data/gui/contact_context_menu.ui.h:3
 #, fuzzy
 msgid "Assign Open_PGP Key..."
 msgstr "指定 Open_PGP 密钥"
 
-#: ../data/glade/contact_context_menu.glade.h:4
+#: ../data/gui/contact_context_menu.ui.h:4
 #, fuzzy
 msgid "E_xecute Command..."
 msgstr "运行命令..."
 
-#: ../data/glade/contact_context_menu.glade.h:5
+#: ../data/gui/contact_context_menu.ui.h:5
 #, fuzzy
 msgid "Edit _Groups..."
 msgstr "编辑群组"
 
 #. Invite to
 #. Invite to Groupchat
-#: ../data/glade/contact_context_menu.glade.h:6 ../src/roster_window.py:5174
-#: ../src/roster_window.py:5333
+#: ../data/gui/contact_context_menu.ui.h:6 ../src/roster_window.py:5281
+#: ../src/roster_window.py:5441
 msgid "In_vite to"
 msgstr "邀请到(_V)"
 
-#: ../data/glade/contact_context_menu.glade.h:7
+#: ../data/gui/contact_context_menu.ui.h:7
 #, fuzzy
 msgid "Invite _Contacts"
 msgstr "联系人"
 
-#: ../data/glade/contact_context_menu.glade.h:8
+#: ../data/gui/contact_context_menu.ui.h:8
 #, fuzzy
 msgid "Remo_ve"
 msgstr "移除(_R)"
 
-#. Send Custom Status
-#: ../data/glade/contact_context_menu.glade.h:9 ../src/roster_window.py:5184
-#: ../src/roster_window.py:5420
+#: ../data/gui/contact_context_menu.ui.h:9 ../src/roster_window.py:5291
+#: ../src/roster_window.py:5530
 #, fuzzy
 msgid "Send Cus_tom Status"
 msgstr "发送自定义 XML"
 
-#: ../data/glade/contact_context_menu.glade.h:10
+#: ../data/gui/contact_context_menu.ui.h:10
 msgid "Send Single _Message..."
 msgstr "发送一条消息...(_M)"
 
-#: ../data/glade/contact_context_menu.glade.h:11
+#: ../data/gui/contact_context_menu.ui.h:11
 #, fuzzy
 msgid "Send _File..."
 msgstr "发送文件(_F)"
 
-#: ../data/glade/contact_context_menu.glade.h:12
+#: ../data/gui/contact_context_menu.ui.h:12
 msgid "Set Custom _Avatar..."
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:13
+#: ../data/gui/contact_context_menu.ui.h:13
 msgid "Start _Chat"
 msgstr "开始群聊(_C)"
 
-#: ../data/glade/contact_context_menu.glade.h:14
+#: ../data/gui/contact_context_menu.ui.h:14
 #, fuzzy
 msgid "Toggle End to End Encryption"
 msgstr "绑定 OpenPGP 加密 (_P)"
 
-#: ../data/glade/contact_context_menu.glade.h:15
+#: ../data/gui/contact_context_menu.ui.h:15
 msgid "Toggle Open_PGP Encryption"
 msgstr "绑定 OpenPGP 加密 (_P)"
 
-#: ../data/glade/contact_context_menu.glade.h:17
+#: ../data/gui/contact_context_menu.ui.h:16
+#, fuzzy
+msgid "_Add to Roster..."
+msgstr "添加至名单(_A)"
+
+#: ../data/gui/contact_context_menu.ui.h:17
 msgid "_Allow him/her to see my status"
 msgstr "允许他/她查看我的状态(_A)"
 
-#: ../data/glade/contact_context_menu.glade.h:18
-#: ../data/glade/gc_occupants_menu.glade.h:7 ../src/roster_window.py:5247
-#: ../src/roster_window.py:5370 ../src/roster_window.py:5501
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:19
+#: ../data/gui/contact_context_menu.ui.h:19
 msgid "_Forbid him/her to see my status"
 msgstr "禁止他/她查看我的状态(_F)"
 
-#: ../data/glade/contact_context_menu.glade.h:20
-#: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:8
-#: ../data/glade/roster_window.glade.h:21 ../src/roster_window.py:5570
+#: ../data/gui/contact_context_menu.ui.h:20 ../src/roster_window.py:5680
 msgid "_History"
 msgstr "历史(_H)"
 
-#: ../data/glade/contact_context_menu.glade.h:21
+#: ../data/gui/contact_context_menu.ui.h:21
 msgid "_Ignore"
 msgstr ""
 
-#: ../data/glade/contact_context_menu.glade.h:22
+#: ../data/gui/contact_context_menu.ui.h:22
 #, fuzzy
 msgid "_Manage Contact"
 msgstr "重命名联系人"
 
-#: ../data/glade/contact_context_menu.glade.h:23
+#: ../data/gui/contact_context_menu.ui.h:23
 #, fuzzy
 msgid "_Rename..."
 msgstr "重命名(_R)"
 
-#: ../data/glade/contact_context_menu.glade.h:24
+#: ../data/gui/contact_context_menu.ui.h:24
 msgid "_Subscription"
 msgstr "认证(_S)"
 
-#: ../data/glade/contact_context_menu.glade.h:25
-#: ../data/glade/gc_occupants_menu.glade.h:13 ../src/roster_window.py:5241
-#: ../src/roster_window.py:5364 ../src/roster_window.py:5498
+#: ../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 ""
 
-#: ../data/glade/contact_context_menu.glade.h:26
+#: ../data/gui/contact_context_menu.ui.h:26
 #, fuzzy
 msgid "_Unignore"
 msgstr "九"
 
-#: ../data/glade/data_form_window.glade.h:1
+#: ../data/gui/data_form_window.ui.h:1
 msgid "Fill in the form."
 msgstr "填写表格。"
 
-#: ../data/glade/data_form_window.glade.h:2
+#: ../data/gui/data_form_window.ui.h:2
 msgid "Room Configuration"
 msgstr "房间设置："
 
-#: ../data/glade/edit_groups_dialog.glade.h:1
+#: ../data/gui/edit_groups_dialog.ui.h:1
 msgid "Edit Groups"
 msgstr "编辑群组"
 
-#: ../data/glade/esession_info_window.glade.h:1
+#: ../data/gui/esession_info_window.ui.h:1
 #, fuzzy
 msgid "(<b>ESession</b> info)"
 msgstr "<b>描述</b>"
 
-#: ../data/glade/esession_info_window.glade.h:2
+#: ../data/gui/esession_info_window.ui.h:2
 msgid "_Verify"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:2
+#: ../data/gui/features_window.ui.h:2
 msgid "<b>List of possible features in Gajim:</b>"
 msgstr ""
 
-#: ../data/glade/features_window.glade.h:3
+#: ../data/gui/features_window.ui.h:3
 #, fuzzy
 msgid "Features"
 msgstr "服务器设定"
 
-#: ../data/glade/filetransfers.glade.h:1
+#: ../data/gui/filetransfers.ui.h:1
 msgid "A list of active, completed and stopped file transfers"
 msgstr "文件发送、完成和中止的清单"
 
-#: ../data/glade/filetransfers.glade.h:2
+#: ../data/gui/filetransfers.ui.h:2
 msgid "Cancel file transfer"
 msgstr "取消文件传输"
 
-#: ../data/glade/filetransfers.glade.h:3
+#: ../data/gui/filetransfers.ui.h:3
 msgid "Cancels the selected file transfer"
 msgstr "取消指定文件传输"
 
-#: ../data/glade/filetransfers.glade.h:4
+#: ../data/gui/filetransfers.ui.h:4
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "取消指定文件传输并删除未完成文件"
 
-#: ../data/glade/filetransfers.glade.h:5
+#: ../data/gui/filetransfers.ui.h:5
 msgid "Clean _up"
 msgstr "清除(_U)"
 
-#: ../data/glade/filetransfers.glade.h:6
+#: ../data/gui/filetransfers.ui.h:6
 msgid "File Transfers"
 msgstr "文件传输"
 
-#: ../data/glade/filetransfers.glade.h:7
+#: ../data/gui/filetransfers.ui.h:7
 msgid "Hides the window"
 msgstr "隐藏该窗口"
 
-#: ../data/glade/filetransfers.glade.h:8
+#: ../data/gui/filetransfers.ui.h:8
 msgid "Remove file transfer from the list."
 msgstr "从列表移除文件传输"
 
-#: ../data/glade/filetransfers.glade.h:9
+#: ../data/gui/filetransfers.ui.h:9
 #, fuzzy
 msgid "Removes completed, cancelled and failed file transfers from the list"
 msgstr "从列表移除已完成，已取消和失败的文件传输"
 
-#: ../data/glade/filetransfers.glade.h:10
+#: ../data/gui/filetransfers.ui.h:10
 #, fuzzy
 msgid "Shows a list of file transfers between you and others"
 msgstr "显示文件传输列表"
 
-#: ../data/glade/filetransfers.glade.h:11
+#: ../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 "该操作会从列表中移除文件传输。如果该传输处于活动状态，将被先中止后移除"
 
-#: ../data/glade/filetransfers.glade.h:12
+#: ../data/gui/filetransfers.ui.h:12
 msgid "When a file transfer is complete show a popup notification"
 msgstr "传输完成后显示弹出气泡提示"
 
-#: ../data/glade/filetransfers.glade.h:13 ../src/filetransfers_window.py:820
-msgid "_Continue"
-msgstr "继续(_C)"
-
-#: ../data/glade/filetransfers.glade.h:14
+#: ../data/gui/filetransfers.ui.h:13
 msgid "_Notify me when a file transfer is complete"
 msgstr "文件传输完成时提醒我(_N)"
 
-#: ../data/glade/filetransfers.glade.h:15 ../src/filetransfers_window.py:204
-msgid "_Open Containing Folder"
-msgstr "打开文件夹(_O)"
-
-#: ../data/glade/filetransfers.glade.h:16
+#: ../data/gui/filetransfers.ui.h:14
 msgid "_Pause"
 msgstr "暂停(_P)"
 
-#: ../data/glade/filetransfers.glade.h:17
+#: ../data/gui/filetransfers.ui.h:15
 msgid "file transfers list"
 msgstr "文件传输列表"
 
-#: ../data/glade/gajim_themes_window.glade.h:1
+#: ../data/gui/gajim_themes_window.ui.h:1
 msgid "<b>Chatstate Tab Colors</b>"
 msgstr "<b>聊天标签颜色</b>"
 
-#: ../data/glade/gajim_themes_window.glade.h:2
-msgid ""
-"Account row\n"
-"Group row\n"
-"Contact row\n"
-"Chat Banner"
-msgstr ""
-"账户栏\n"
-"组栏\n"
-"联系人栏\n"
-"聊天条"
+#: ../data/gui/gajim_themes_window.ui.h:2
+#, fuzzy
+msgid "Account row"
+msgstr "账户"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:859
+#: ../data/gui/gajim_themes_window.ui.h:3 ../src/chat_control.py:883
 msgid "Bold"
 msgstr "粗体"
 
-#: ../data/glade/gajim_themes_window.glade.h:7
+#: ../data/gui/gajim_themes_window.ui.h:4
+msgid "Chat Banner"
+msgstr ""
+
+#: ../data/gui/gajim_themes_window.ui.h:5
 msgid "Composing"
 msgstr "正在编写"
 
-#: ../data/glade/gajim_themes_window.glade.h:8
+#: ../data/gui/gajim_themes_window.ui.h:6
+#, fuzzy
+msgid "Contact row"
+msgstr "联系人"
+
+#: ../data/gui/gajim_themes_window.ui.h:7
 msgid "Font style:"
 msgstr "字体风格："
 
-#: ../data/glade/gajim_themes_window.glade.h:9
+#: ../data/gui/gajim_themes_window.ui.h:8
 msgid "Gajim Themes Customization"
 msgstr "Gajim 主题自定义"
 
-#: ../data/glade/gajim_themes_window.glade.h:10
+#: ../data/gui/gajim_themes_window.ui.h:9
 msgid "Gone"
 msgstr "已离开"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:150
+#: ../data/gui/gajim_themes_window.ui.h:10
+#, fuzzy
+msgid "Group row"
+msgstr "群组"
+
+#: ../data/gui/gajim_themes_window.ui.h:11 ../src/common/pep.py:150
 msgid "Inactive"
 msgstr "未活动的"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:860
+#: ../data/gui/gajim_themes_window.ui.h:12 ../src/chat_control.py:884
 msgid "Italic"
 msgstr "斜体"
 
-#: ../data/glade/gajim_themes_window.glade.h:13
+#: ../data/gui/gajim_themes_window.ui.h:13
 msgid ""
 "MUC\n"
 "Messages"
@@ -1361,7 +1246,7 @@ msgstr ""
 "MUC\n"
 "消息"
 
-#: ../data/glade/gajim_themes_window.glade.h:15
+#: ../data/gui/gajim_themes_window.ui.h:15
 msgid ""
 "MUC Directed\n"
 "Messages"
@@ -1369,116 +1254,75 @@ msgstr ""
 "MUC 定向的\n"
 "消息"
 
-#: ../data/glade/gajim_themes_window.glade.h:17
+#: ../data/gui/gajim_themes_window.ui.h:17
 msgid "Paused"
 msgstr "已暂停"
 
-#: ../data/glade/gajim_themes_window.glade.h:18
+#: ../data/gui/gajim_themes_window.ui.h:18
 msgid "Text _color:"
 msgstr "文本颜色(_C)："
 
-#: ../data/glade/gajim_themes_window.glade.h:19
+#: ../data/gui/gajim_themes_window.ui.h:19
 msgid "Text _font:"
 msgstr "文本字体(_F)："
 
-#: ../data/glade/gajim_themes_window.glade.h:20
+#: ../data/gui/gajim_themes_window.ui.h:20
 msgid "_Background:"
 msgstr "背景(_B)"
 
-#: ../data/glade/gc_control_popup_menu.glade.h:1
-#, fuzzy
-msgid "Change _Nickname..."
-msgstr "更换昵称(_N)"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:2
-#, fuzzy
-msgid "Change _Subject..."
-msgstr "更换主题(_S)"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:3
-#, fuzzy
-msgid "Configure _Room..."
-msgstr "设置房间(_R)"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1746
-#, fuzzy
-msgid "_Bookmark"
-msgstr "将本房间加入书签(_B)"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:5
-msgid "_Destroy Room"
-msgstr ""
-
-#: ../data/glade/gc_control_popup_menu.glade.h:7
-#, fuzzy
-msgid "_Manage Room"
-msgstr "书签管理"
-
-#: ../data/glade/gc_control_popup_menu.glade.h:8
+#: ../data/gui/gc_control_popup_menu.ui.h:1
 msgid "_Minimize on close"
 msgstr ""
 
-#: ../data/glade/gc_occupants_menu.glade.h:1
+#: ../data/gui/gc_occupants_menu.ui.h:1
 msgid "Mo_derator"
 msgstr "仲裁人(_D)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:2
+#: ../data/gui/gc_occupants_menu.ui.h:2
 #, fuzzy
 msgid "Occupant Actions"
 msgstr "房主动作(_O)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:3
-msgid "Send _File"
-msgstr "发送文件(_F)"
-
-#: ../data/glade/gc_occupants_menu.glade.h:4
-msgid "_Add to Roster"
-msgstr "添加至名单(_A)"
-
-#: ../data/glade/gc_occupants_menu.glade.h:5
+#: ../data/gui/gc_occupants_menu.ui.h:3
 msgid "_Admin"
 msgstr "管理(_A)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:6
+#: ../data/gui/gc_occupants_menu.ui.h:4
 msgid "_Ban"
 msgstr "封禁(_B)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/gui/gc_occupants_menu.ui.h:5
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/gui/gc_occupants_menu.ui.h:6
 msgid "_Member"
 msgstr "成员(_M)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/gui/gc_occupants_menu.ui.h:7
 msgid "_Owner"
 msgstr "拥有人(_O)"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
-msgid "_Send Private Message"
-msgstr "发送私聊消息(_S)"
-
-#: ../data/glade/gc_occupants_menu.glade.h:14
+#: ../data/gui/gc_occupants_menu.ui.h:8
 msgid "_Voice"
 msgstr "语音(_V)"
 
-#: ../data/glade/groups_post_window.glade.h:1
+#: ../data/gui/groups_post_window.ui.h:1
 #, fuzzy
 msgid "Create new post"
 msgstr "新发表"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:244
+#: ../data/gui/groups_post_window.ui.h:2 ../src/common/helpers.py:258
 msgid "From"
 msgstr "来自"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
-#: ../src/history_manager.py:226
+#: ../data/gui/groups_post_window.ui.h:3 ../src/history_manager.py:188
+#: ../src/history_manager.py:219
 msgid "Subject"
 msgstr "主题"
 
-#: ../data/glade/history_manager.glade.h:1
+#: ../data/gui/history_manager.ui.h:1
 #, fuzzy
 msgid ""
 "<b>WARNING:</b>\n"
@@ -1493,26 +1337,20 @@ msgstr ""
 "If you plan to do massive deletions, please make sure Gajim is not running. "
 "Generally avoid deletions with contacts you currently chat with."
 
-#: ../data/glade/history_manager.glade.h:3
+#: ../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/glade/history_manager.glade.h:4 ../src/dialogs.py:3007
-#: ../src/dialogs.py:3104
-msgid "Delete"
-msgstr "删除"
-
-#: ../data/glade/history_manager.glade.h:5
+#: ../data/gui/history_manager.ui.h:4
 msgid "Export"
 msgstr "输出"
 
-#: ../data/glade/history_manager.glade.h:6
+#: ../data/gui/history_manager.ui.h:5
 msgid "Gajim History Logs Manager"
 msgstr "Gajim 历史记录管理器"
 
-#: ../data/glade/history_manager.glade.h:7
+#: ../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"
@@ -1521,423 +1359,437 @@ msgid ""
 "and/or search database from below."
 msgstr ""
 
-#: ../data/glade/history_manager.glade.h:10
+#: ../data/gui/history_manager.ui.h:9
 msgid "_Search Database"
 msgstr "搜索数据库(_S)"
 
-#: ../data/glade/history_window.glade.h:1 ../src/history_window.py:323
+#: ../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/glade/history_window.glade.h:2
-msgid ""
-"Enter JID or Contact name\n"
-"Groupchat Histories\n"
-"All Chat Histories"
-msgstr ""
+#: ../data/gui/history_window.ui.h:3
+#, fuzzy
+msgid "Enter JID or Contact name"
+msgstr "联系人名"
 
-#: ../data/glade/history_window.glade.h:5
+#: ../data/gui/history_window.ui.h:4
+#, fuzzy
+msgid "Groupchat Histories"
+msgstr "群聊"
+
+#: ../data/gui/history_window.ui.h:5
 #, fuzzy
 msgid "Search:"
 msgstr "查找"
 
-#: ../data/glade/history_window.glade.h:6
-#: ../data/glade/zeroconf_information_window.glade.h:10
+#: ../data/gui/history_window.ui.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:10
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
-#: ../data/glade/join_groupchat_window.glade.h:2
+#: ../data/gui/join_groupchat_window.ui.h:2
 #, fuzzy
-msgid "Bookmark this room"
-msgstr "将本房间加入书签(_B)"
+msgid "Bro_wse Rooms"
+msgstr "浏览(_B)"
 
-#: ../data/glade/join_groupchat_window.glade.h:3 ../src/dialogs.py:2076
+#: ../data/gui/join_groupchat_window.ui.h:3 ../src/dialogs.py:2171
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
-#: ../data/glade/join_groupchat_window.glade.h:4
+#: ../data/gui/join_groupchat_window.ui.h:4
 #, fuzzy
-msgid "Join this room automatically when I connect"
+msgid "Join this room _automatically when I connect"
 msgstr "当连接上时设置我的模版"
 
-#: ../data/glade/join_groupchat_window.glade.h:5
-#: ../data/glade/manage_bookmarks_window.glade.h:5
+#: ../data/gui/join_groupchat_window.ui.h:5
+#: ../data/gui/manage_bookmarks_window.ui.h:5
 msgid "Nickname:"
 msgstr "昵称："
 
-#: ../data/glade/join_groupchat_window.glade.h:6
-#: ../data/glade/manage_bookmarks_window.glade.h:6
+#: ../data/gui/join_groupchat_window.ui.h:6
+#: ../data/gui/manage_bookmarks_window.ui.h:6
 msgid "Password:"
 msgstr "密码："
 
-#: ../data/glade/join_groupchat_window.glade.h:7
+#: ../data/gui/join_groupchat_window.ui.h:7
 msgid "Recently:"
 msgstr "最近："
 
-#: ../data/glade/join_groupchat_window.glade.h:8
-#: ../data/glade/manage_bookmarks_window.glade.h:8
+#: ../data/gui/join_groupchat_window.ui.h:8
+#: ../data/gui/manage_bookmarks_window.ui.h:8
 msgid "Room:"
 msgstr "房间："
 
-#: ../data/glade/join_groupchat_window.glade.h:9 ../src/disco.py:1306
-#: ../src/disco.py:1750
+#: ../data/gui/join_groupchat_window.ui.h:9
+#: ../data/gui/manage_bookmarks_window.ui.h:9 ../src/config.py:1765
+msgid "Server:"
+msgstr "服务器："
+
+#: ../data/gui/join_groupchat_window.ui.h:10
+#, fuzzy
+msgid "_Bookmark this room"
+msgstr "将本房间加入书签(_B)"
+
+#: ../data/gui/join_groupchat_window.ui.h:11 ../src/disco.py:1343
+#: ../src/disco.py:1787
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../data/glade/manage_accounts_window.glade.h:1
-msgid "Manage Accounts"
-msgstr "帐户管理"
-
-#: ../data/glade/manage_bookmarks_window.glade.h:1
+#: ../data/gui/manage_bookmarks_window.ui.h:1
 msgid "Auto join"
 msgstr "自动加入"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:2
+#: ../data/gui/manage_bookmarks_window.ui.h:2
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "如果选定，Gajim 会在启动时加入聊天群组"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:3
+#: ../data/gui/manage_bookmarks_window.ui.h:3
 msgid "Manage Bookmarks"
 msgstr "书签管理"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:4
+#: ../data/gui/manage_bookmarks_window.ui.h:4
 msgid "Minimize on Auto Join"
 msgstr ""
 
-#: ../data/glade/manage_bookmarks_window.glade.h:7
+#: ../data/gui/manage_bookmarks_window.ui.h:7
 msgid "Print status:"
 msgstr "打印状态："
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1663
-msgid "Server:"
-msgstr "服务器："
-
-#: ../data/glade/manage_bookmarks_window.glade.h:10
+#: ../data/gui/manage_bookmarks_window.ui.h:10
 msgid "Title:"
 msgstr "标题："
 
-#: ../data/glade/manage_pep_services_window.glade.h:1
+#: ../data/gui/manage_pep_services_window.ui.h:1
 #, fuzzy
 msgid "PEP Service Configuration"
 msgstr "房间设置："
 
-#: ../data/glade/manage_pep_services_window.glade.h:2
+#: ../data/gui/manage_pep_services_window.ui.h:2
 #, fuzzy
 msgid "_Configure"
 msgstr "继续(_C)"
 
-#: ../data/glade/manage_pep_services_window.glade.h:3
-#, fuzzy
-msgid "gtk-delete"
-msgstr "删除"
-
-#: ../data/glade/manage_proxies_window.glade.h:1
+#: ../data/gui/manage_proxies_window.ui.h:1
 msgid "<b>Properties</b>"
 msgstr "<b>属性</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:2
+#: ../data/gui/manage_proxies_window.ui.h:2
 msgid "<b>Settings</b>"
 msgstr "<b>设置</b>"
 
-#: ../data/glade/manage_proxies_window.glade.h:3
+#: ../data/gui/manage_proxies_window.ui.h:3
+msgid "BOSH"
+msgstr ""
+
+#: ../data/gui/manage_proxies_window.ui.h:4
 #, fuzzy
-msgid ""
-"HTTP Connect\n"
-"SOCKS5\n"
-"BOSH"
+msgid "HTTP Connect"
 msgstr "HTTP 连接"
 
-#: ../data/glade/manage_proxies_window.glade.h:6
+#: ../data/gui/manage_proxies_window.ui.h:5
 msgid "Manage Proxy Profiles"
 msgstr "代理服务器模板管理"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/gui/manage_proxies_window.ui.h:6
 msgid "Pass_word:"
 msgstr "密码(_W)"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/gui/manage_proxies_window.ui.h:7
 #, fuzzy
 msgid "Proxy _Host:"
 msgstr "代理服务器："
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/gui/manage_proxies_window.ui.h:8
 #, fuzzy
 msgid "Proxy _Port:"
 msgstr "端口(_P)"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../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 "使用代理服务器(_U)"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/gui/manage_proxies_window.ui.h:11
 #, fuzzy
 msgid "Use proxy auth_entication"
 msgstr "使用验证"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/gui/manage_proxies_window.ui.h:12
 #, fuzzy
 msgid "_BOSH URL:"
 msgstr "URL：(_U)"
 
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/gui/manage_proxies_window.ui.h:13
+#, fuzzy
+msgid "_Name:"
+msgstr "名称(_N)："
+
+#: ../data/gui/manage_proxies_window.ui.h:14
 #, fuzzy
 msgid "_Type:"
 msgstr "类型："
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/gui/manage_proxies_window.ui.h:15
 msgid "_Username:"
 msgstr "用户名(_U)："
 
-#: ../data/glade/message_window.glade.h:1
-#, fuzzy
-msgid "Add this contact to roster (Ctrl+D)"
-msgstr "向名单添加联系人"
-
-#: ../data/glade/message_window.glade.h:2
-#, fuzzy
-msgid "Bookmark this room (Ctrl+B)"
-msgstr "将本房间加入书签(_B)"
-
-#: ../data/glade/message_window.glade.h:3
-msgid "Browse the chat history (Ctrl+H)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:4
-msgid "Change the room's subject (Alt+T)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:5
-#, fuzzy
-msgid "Change your nickname (Ctrl+N)"
-msgstr "更换昵称(_N)"
-
-#: ../data/glade/message_window.glade.h:6
-#, fuzzy
-msgid "Invite contacts to the conversation (Ctrl+G)"
-msgstr "正在专注于聊天"
-
-#: ../data/glade/message_window.glade.h:7
-msgid "Send a file (Ctrl+F)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:8
-#, fuzzy
-msgid "Show a list of emoticons (Alt+M)"
-msgstr "点这里插入表情符 (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:9
-#, fuzzy
-msgid "Show a list of formattings"
-msgstr "点这里插入表情符 (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:10
-#, fuzzy
-msgid "Show a menu of advanced functions (Alt+D)"
-msgstr "点这里插入表情符 (Alt+M)"
-
-#: ../data/glade/message_window.glade.h:11
-msgid "Show the contact's profile (Ctrl+I)"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:12
-msgid "Toggle audio session"
-msgstr ""
-
-#: ../data/glade/message_window.glade.h:13
-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/glade/message_window.glade.h:15
-#: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:266
-msgid "_Send"
-msgstr "发送(_S)"
-
-#: ../data/glade/passphrase_dialog.glade.h:1
+#: ../data/gui/passphrase_dialog.ui.h:1
 msgid "Passphrase"
 msgstr "密文"
 
-#: ../data/glade/preferences_window.glade.h:1
+#: ../data/gui/preferences_window.ui.h:1
 msgid "<b>Advanced Configuration Editor</b>"
 msgstr "<b>高级设置编辑器</b>"
 
-#: ../data/glade/preferences_window.glade.h:2
+#: ../data/gui/preferences_window.ui.h:2
 msgid "<b>Applications</b>"
 msgstr "<b>应用</b>"
 
-#: ../data/glade/preferences_window.glade.h:3
+#: ../data/gui/preferences_window.ui.h:3
+#, fuzzy
+msgid "<b>Audio</b>"
+msgstr "<b>动作</b>"
+
+#: ../data/gui/preferences_window.ui.h:4
 #, fuzzy
 msgid "<b>Auto Status</b>"
 msgstr "<b>动作</b>"
 
-#: ../data/glade/preferences_window.glade.h:4
+#: ../data/gui/preferences_window.ui.h:5
 #, fuzzy
 msgid "<b>Chat Appearance</b>"
 msgstr "<b>编辑规则</b>"
 
-#: ../data/glade/preferences_window.glade.h:5
+#: ../data/gui/preferences_window.ui.h:6
 #, fuzzy
 msgid "<b>Chat Line Colors</b>"
 msgstr "<b>聊天标签颜色</b>"
 
-#: ../data/glade/preferences_window.glade.h:6
+#: ../data/gui/preferences_window.ui.h:7
 #, fuzzy
 msgid "<b>Chat state notifications</b>"
 msgstr "<b>可视化提示</b>"
 
+#: ../data/gui/preferences_window.ui.h:8
+#, fuzzy
+msgid "<b>Connection</b>"
+msgstr "<b>条件</b>"
+
 #. a header for custom browser/client/file manager. so translate sth like: Custom Settings
-#: ../data/glade/preferences_window.glade.h:8
+#: ../data/gui/preferences_window.ui.h:10
 msgid "<b>Custom</b>"
 msgstr "<b>自定义</b>"
 
-#: ../data/glade/preferences_window.glade.h:9
+#: ../data/gui/preferences_window.ui.h:11
 #, fuzzy
 msgid "<b>Font</b>"
 msgstr "<b>声音</b>"
 
-#: ../data/glade/preferences_window.glade.h:10
+#: ../data/gui/preferences_window.ui.h:12
 msgid "<b>GMail Options</b>"
 msgstr "<b>GMail 选项</b>"
 
-#: ../data/glade/preferences_window.glade.h:12
+#: ../data/gui/preferences_window.ui.h:14
 msgid "<b>Preset Status Messages</b>"
 msgstr "<b>预设状态消息</b>"
 
-#: ../data/glade/preferences_window.glade.h:13
+#: ../data/gui/preferences_window.ui.h:15
 #, fuzzy
 msgid "<b>Privacy</b>"
 msgstr "<i>私人列表</i>"
 
-#: ../data/glade/preferences_window.glade.h:14
+#: ../data/gui/preferences_window.ui.h:16
 msgid "<b>Roster Appearance</b>"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:16
+#: ../data/gui/preferences_window.ui.h:18
 #, fuzzy
 msgid "<b>Status Messages</b>"
 msgstr "<b>预设状态消息</b>"
 
-#: ../data/glade/preferences_window.glade.h:17
+#: ../data/gui/preferences_window.ui.h:19
 #, fuzzy
 msgid "<b>Themes</b>"
 msgstr "<b>属性</b>"
 
-#: ../data/glade/preferences_window.glade.h:18
+#: ../data/gui/preferences_window.ui.h:20
+#, fuzzy
+msgid "<b>Video</b>"
+msgstr "<b>添加规则</b>"
+
+#: ../data/gui/preferences_window.ui.h:21
 msgid "<b>Visual Notifications</b>"
 msgstr "<b>可视化提示</b>"
 
-#: ../data/glade/preferences_window.glade.h:19
+#: ../data/gui/preferences_window.ui.h:22
+msgid "<i>(example: stunserver.org)</i>"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:23
 msgid "Advanced"
 msgstr "高级"
 
-#: ../data/glade/preferences_window.glade.h:20
+#: ../data/gui/preferences_window.ui.h:24
 #, fuzzy
 msgid "Advanced..."
 msgstr "高级"
 
-#: ../data/glade/preferences_window.glade.h:21
-msgid ""
-"All chat states\n"
-"Composing only\n"
-"Disabled"
-msgstr ""
-"所有聊天状态\n"
-"仅在书写\n"
-"禁用"
+#: ../data/gui/preferences_window.ui.h:25
+#, fuzzy
+msgid "All chat states"
+msgstr "所有状态"
 
-#: ../data/glade/preferences_window.glade.h:24
+#: ../data/gui/preferences_window.ui.h:26
 msgid "Allow _OS information to be sent"
 msgstr "允许发送操作系统信息(_O)"
 
-#: ../data/glade/preferences_window.glade.h:25
+#: ../data/gui/preferences_window.ui.h:27
+#, fuzzy
+msgid "Allow my _idle time to be sent"
+msgstr "允许发送操作系统信息(_O)"
+
+#: ../data/gui/preferences_window.ui.h:28
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "允许提示，当我离开/不可用/忙/隐身"
 
-#: ../data/glade/preferences_window.glade.h:26
+#: ../data/gui/preferences_window.ui.h:29
 msgid "Allow sound when I'm _busy"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:27
+#: ../data/gui/preferences_window.ui.h:30
+#, fuzzy
+msgid "Always"
+msgstr "离开"
+
+#: ../data/gui/preferences_window.ui.h:31
+msgid "Always use GNOME default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:32
+msgid "Always use KDE default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:33
+msgid "Always use Xfce default applications"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:34
 msgid "Ask status message when I:"
 msgstr "询问状态消息，当我："
 
-#: ../data/glade/preferences_window.glade.h:28
-#, fuzzy
-msgid ""
-"Autodetect on every Gajim startup\n"
-"Always use GNOME default applications\n"
-"Always use KDE default applications\n"
-"Always use Xfce default applications\n"
-"Custom"
+#: ../data/gui/preferences_window.ui.h:35 ../src/features_window.py:104
+msgid "Audio / Video"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:36
+msgid "Audio input device"
 msgstr ""
-"每次 Gajim 启动时自动探测\n"
-"总是使用 GNOME 默认应用\n"
-"总是使用 KDE 默认应用\n"
-"总是使用 Xfce 默认应用\n"
-"自定义"
 
-#: ../data/glade/preferences_window.glade.h:33
+#: ../data/gui/preferences_window.ui.h:37
+msgid "Audio output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:38
+#, fuzzy
+msgid "Autodetect on every Gajim startup"
+msgstr "Gajim 启动时连接(_O)"
+
+#: ../data/gui/preferences_window.ui.h:39
 #, fuzzy
 msgid "Chat message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:34
+#: ../data/gui/preferences_window.ui.h:40
 msgid "Check on startup if Gajim is the _default Jabber client"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:35
+#: ../data/gui/preferences_window.ui.h:41
+#, fuzzy
+msgid "Composing only"
+msgstr "正在编写"
+
+#: ../data/gui/preferences_window.ui.h:42
 msgid "Configure color and font of the interface"
 msgstr "配置界面颜色与字体"
 
-#: ../data/glade/preferences_window.glade.h:36
+#: ../data/gui/preferences_window.ui.h:43
 #, fuzzy
 msgid "Contact's message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:37
+#: ../data/gui/preferences_window.ui.h:44
 #, fuzzy
 msgid "Contact's nickname:"
 msgstr "联系人名"
 
-#: ../data/glade/preferences_window.glade.h:38
-msgid ""
-"Detached roster with detached chats\n"
-"Detached roster with single chat\n"
-"Single window for everything\n"
-"Detached roster with chat grouped by account\n"
-"Detached roster with chat grouped by type"
+#: ../data/gui/preferences_window.ui.h:45
+#, fuzzy
+msgid "Custom"
+msgstr "<b>自定义</b>"
+
+#: ../data/gui/preferences_window.ui.h:46
+msgid "Detached roster with chat grouped by account"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:47
+msgid "Detached roster with chat grouped by type"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:48
+msgid "Detached roster with detached chats"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:43
+#: ../data/gui/preferences_window.ui.h:49
+msgid "Detached roster with single chat"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:50 ../src/config.py:170
+#: ../src/config.py:653
+msgid "Disabled"
+msgstr "禁用"
+
+#: ../data/gui/preferences_window.ui.h:51
 #, fuzzy
 msgid "Display _activity of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:44
+#: ../data/gui/preferences_window.ui.h:52
 msgid "Display _extra email details"
 msgstr "显示扩展电子邮件详情(_E)"
 
-#: ../data/glade/preferences_window.glade.h:45
+#: ../data/gui/preferences_window.ui.h:53
+#, fuzzy
+msgid "Display _location of contacts in roster"
+msgstr "显示名单中的联系人明细(_V)"
+
+#: ../data/gui/preferences_window.ui.h:54
 #, fuzzy
 msgid "Display _tunes of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:46
+#: ../data/gui/preferences_window.ui.h:55
 msgid "Display a_vatars of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:47
+#: ../data/gui/preferences_window.ui.h:56
 #, fuzzy
 msgid "Display m_ood of contacts in roster"
 msgstr "显示名单中的联系人明细(_V)"
 
-#: ../data/glade/preferences_window.glade.h:48
+#: ../data/gui/preferences_window.ui.h:57
 msgid "Display status _messages of contacts in roster"
 msgstr "显示名单中联系人的状态消息(_M)"
 
-#: ../data/glade/preferences_window.glade.h:49
+#: ../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 "
@@ -1946,7 +1798,7 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定您想在聊天窗口中"
 "显示的聊天状态。"
 
-#: ../data/glade/preferences_window.glade.h:50
+#: ../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 "
@@ -1955,80 +1807,86 @@ msgstr ""
 "Gajim 可以收发您与联系人所进行谈话的相关信息。此处您可是指定发给第三方的角"
 "色。"
 
-#: ../data/glade/preferences_window.glade.h:51
+#: ../data/gui/preferences_window.ui.h:60
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚离开的联系人"
 
-#: ../data/glade/preferences_window.glade.h:53
+#: ../data/gui/preferences_window.ui.h:62
 #, fuzzy
 msgid "Hide all buttons in chat windows"
 msgstr "在群聊窗口中隐藏按钮。"
 
-#: ../data/glade/preferences_window.glade.h:54
+#: ../data/gui/preferences_window.ui.h:63
 #, fuzzy
 msgid ""
 "If checked, Gajim will allow others to detect the operation system you are "
 "using"
 msgstr "如果选定，Gajim 会在启动时加入聊天群组"
 
-#: ../data/glade/preferences_window.glade.h:55
+#: ../data/gui/preferences_window.ui.h:64
 msgid ""
 "If checked, Gajim will also include information about the sender of the new "
 "emails"
 msgstr "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
-#: ../data/glade/preferences_window.glade.h:56
+#: ../data/gui/preferences_window.ui.h:65
 #, fuzzy
 msgid ""
 "If checked, Gajim will change status to Away when the computer is unused."
 msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
 
-#: ../data/glade/preferences_window.glade.h:57
+#: ../data/gui/preferences_window.ui.h:66
 msgid ""
 "If checked, Gajim will change status to Not Available when the computer has "
 "not been used even longer"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:58
+#: ../data/gui/preferences_window.ui.h:67
 msgid ""
 "If checked, Gajim will display avatars of contacts in roster window and in "
 "group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:59
+#: ../data/gui/preferences_window.ui.h:68
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window and in group chats"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中联系人名下方显示联系人状态消息"
 
-#: ../data/glade/preferences_window.glade.h:60
+#: ../data/gui/preferences_window.ui.h:69
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the activity of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:61
+#: ../data/gui/preferences_window.ui.h:70
+#, fuzzy
+msgid ""
+"If checked, Gajim will display the location of contacts in the roster window"
+msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
+
+#: ../data/gui/preferences_window.ui.h:71
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the mood of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:62
+#: ../data/gui/preferences_window.ui.h:72
 #, fuzzy
 msgid ""
 "If checked, Gajim will display the tunes of contacts in the roster window"
 msgstr "如果选定，Gajim 会在名单和群聊窗口中显示名单中的联系人明细"
 
-#: ../data/glade/preferences_window.glade.h:63
+#: ../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/glade/preferences_window.glade.h:64
+#: ../data/gui/preferences_window.ui.h:74
 #, fuzzy
 msgid ""
 "If checked, Gajim will ignore incoming events from unauthorized contacts. "
@@ -2038,21 +1896,21 @@ msgstr ""
 "当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，"
 "请谨慎使用。"
 
-#: ../data/glade/preferences_window.glade.h:65
+#: ../data/gui/preferences_window.ui.h:75
 msgid ""
 "If checked, Gajim will keep logs for encrypted messages. Please note that "
 "when using E2E encryption the remote party has to agree on logging, else the "
 "messages will not be logged."
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:66
+#: ../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 "如果选中，Gajim 将包含关于新的电子邮件发送者的信息"
 
-#: ../data/glade/preferences_window.glade.h:67
+#: ../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, "
@@ -2061,91 +1919,116 @@ msgstr ""
 "如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同"
 "图标方式显示，以表示在线，离开，忙，等等...)"
 
-#: ../data/glade/preferences_window.glade.h:68
+#: ../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 ""
 
-#: ../data/glade/preferences_window.glade.h:69
+#: ../data/gui/preferences_window.ui.h:79
 msgid ""
 "If not disabled, Gajim will replace ascii smilies like ':)' with equivalent "
 "animated or static graphical emoticons"
 msgstr "如果不禁用，Gajim 会用相应的图片表情符替代字符表情,例如“:)”"
 
-#: ../data/glade/preferences_window.glade.h:70
+#: ../data/gui/preferences_window.ui.h:80
 msgid "Log _encrypted chat session"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:71
+#: ../data/gui/preferences_window.ui.h:81
 #, fuzzy
 msgid "Ma_ke message windows compact"
 msgstr "消息窗口：(_W)"
 
-#: ../data/glade/preferences_window.glade.h:72
+#: ../data/gui/preferences_window.ui.h:82
 msgid "Ma_nage..."
 msgstr "管理...(_N)"
 
-#: ../data/glade/preferences_window.glade.h:73
-msgid ""
-"Never\n"
-"Only when pending events\n"
-"Always"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:83
+#, fuzzy
+msgid "Never"
+msgstr "从不(_N)"
 
-#: ../data/glade/preferences_window.glade.h:76
+#: ../data/gui/preferences_window.ui.h:84
 #, fuzzy
 msgid "Notifications"
 msgstr "帐户修改"
 
-#: ../data/glade/preferences_window.glade.h:77
+#: ../data/gui/preferences_window.ui.h:85
 #, fuzzy
 msgid "Notify me about contacts that sign _in"
 msgstr "提醒我关于联系人："
 
-#: ../data/glade/preferences_window.glade.h:78
+#: ../data/gui/preferences_window.ui.h:86
 #, fuzzy
 msgid "Notify me about contacts that sign _out"
 msgstr "提醒我关于联系人："
 
-#: ../data/glade/preferences_window.glade.h:79
+#: ../data/gui/preferences_window.ui.h:87
+#, fuzzy
+msgid "Notify me about it"
+msgstr "提醒我(_N)"
+
+#: ../data/gui/preferences_window.ui.h:88
 msgid "Notify on new _GMail email"
 msgstr "新 Gmail 邮件通知"
 
-#: ../data/glade/preferences_window.glade.h:80
+#: ../data/gui/preferences_window.ui.h:89
+msgid "Only when pending events"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:90
 #, fuzzy
 msgid "Personal Events"
 msgstr "个人信息"
 
-#: ../data/glade/preferences_window.glade.h:81
+#: ../data/gui/preferences_window.ui.h:91
 msgid "Play _sounds"
 msgstr "播放声音(_S)"
 
-#: ../data/glade/preferences_window.glade.h:82
-msgid ""
-"Pop it up\n"
-"Notify me about it\n"
-"Show only in roster"
-msgstr ""
+#: ../data/gui/preferences_window.ui.h:92
+#, fuzzy
+msgid "Pop it up"
+msgstr "弹出(_P)"
 
-#: ../data/glade/preferences_window.glade.h:85
+#: ../data/gui/preferences_window.ui.h:93
 msgid "Preferences"
 msgstr "参数"
 
-#: ../data/glade/preferences_window.glade.h:86
+#: ../data/gui/preferences_window.ui.h:94
+msgid ""
+"STUN server hostname. If none given, Gajim will try\n"
+"to discover one from server."
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:96
+#, fuzzy
+msgid "STUN server:"
+msgstr "服务器："
+
+#: ../data/gui/preferences_window.ui.h:97
+#, fuzzy
+msgid "Show only in roster"
+msgstr "只显示名单中(_R)"
+
+#: ../data/gui/preferences_window.ui.h:98
 #, fuzzy
 msgid "Show systray:"
 msgstr "在系统托盘中显示事件(_S)"
 
-#: ../data/glade/preferences_window.glade.h:87
+#: ../data/gui/preferences_window.ui.h:99
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: ../data/glade/preferences_window.glade.h:88
+#: ../data/gui/preferences_window.ui.h:100
 msgid "Sign _out"
 msgstr "退出登录(_O)"
 
-#: ../data/glade/preferences_window.glade.h:89
+#: ../data/gui/preferences_window.ui.h:101
+msgid "Single window for everything"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:102
 msgid ""
 "Some messages may include rich content (formatting, colors etc). If checked, "
 "Gajim will just display the raw message text."
@@ -2153,30 +2036,30 @@ msgstr ""
 "一些消息会包含丰富的内容(例如 格式，颜色) 。如果选定，Gajim 将显示原本的消息"
 "内容。"
 
-#: ../data/glade/preferences_window.glade.h:90
+#: ../data/gui/preferences_window.ui.h:103
 #, fuzzy
 msgid "Sort contacts by status"
 msgstr "按状态分类联系人(_S)"
 
-#: ../data/glade/preferences_window.glade.h:91 ../src/config.py:377
+#: ../data/gui/preferences_window.ui.h:104 ../src/config.py:391
 msgid "Status"
 msgstr "状态"
 
-#: ../data/glade/preferences_window.glade.h:92
+#: ../data/gui/preferences_window.ui.h:105
 #, fuzzy
 msgid "Status _iconset:"
 msgstr "默认状态图标设置:(_I)"
 
-#: ../data/glade/preferences_window.glade.h:93
+#: ../data/gui/preferences_window.ui.h:106
 #, fuzzy
 msgid "Style"
 msgstr "已冻结"
 
-#: ../data/glade/preferences_window.glade.h:94
+#: ../data/gui/preferences_window.ui.h:107
 msgid "T_heme:"
 msgstr "主题：(_H)"
 
-#: ../data/glade/preferences_window.glade.h:95
+#: ../data/gui/preferences_window.ui.h:108
 msgid ""
 "The auto away status message. If empty, Gajim will not change the current "
 "status message\n"
@@ -2184,7 +2067,7 @@ msgid ""
 "$T will be replaced by auto-away timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:98
+#: ../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"
@@ -2192,789 +2075,765 @@ msgid ""
 "$T will be replaced by auto-not-available timeout"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:101
+#: ../data/gui/preferences_window.ui.h:114
 #, fuzzy
 msgid "Use _transports icons"
 msgstr "使用代理的图标设定(_T)"
 
-#: ../data/glade/preferences_window.glade.h:102
+#: ../data/gui/preferences_window.ui.h:115
 msgid "Use system _default"
 msgstr "使用系统默认(_D)"
 
-#: ../data/glade/preferences_window.glade.h:103
+#: ../data/gui/preferences_window.ui.h:116
+msgid "Video input device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:117
+msgid "Video output device"
+msgstr ""
+
+#: ../data/gui/preferences_window.ui.h:118
 #, fuzzy
 msgid "When new event is received:"
 msgstr "当新事件发生时"
 
-#: ../data/glade/preferences_window.glade.h:104
+#: ../data/gui/preferences_window.ui.h:119
 #, fuzzy
 msgid "Your message:"
 msgstr "错误消息：%s"
 
-#: ../data/glade/preferences_window.glade.h:105
+#: ../data/gui/preferences_window.ui.h:120
 #, fuzzy
 msgid "Your nickname:"
 msgstr "在昵称前：(_E)"
 
-#: ../data/glade/preferences_window.glade.h:106
+#: ../data/gui/preferences_window.ui.h:121
 #, fuzzy
 msgid "_Away after:"
 msgstr "自动离开(_A)："
 
-#: ../data/glade/preferences_window.glade.h:107
+#: ../data/gui/preferences_window.ui.h:122
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../data/glade/preferences_window.glade.h:108
+#: ../data/gui/preferences_window.ui.h:123
 #, fuzzy
 msgid "_Display chat state notifications:"
 msgstr "显示聊天状态信息(_F)："
 
-#: ../data/glade/preferences_window.glade.h:109
+#: ../data/gui/preferences_window.ui.h:124
 #, fuzzy
 msgid "_Emoticons:"
 msgstr "表情符："
 
-#: ../data/glade/preferences_window.glade.h:110
+#: ../data/gui/preferences_window.ui.h:125
 msgid "_File manager:"
 msgstr "文件管理器：(_F)"
 
-#: ../data/glade/preferences_window.glade.h:111
+#: ../data/gui/preferences_window.ui.h:126
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../data/glade/preferences_window.glade.h:112
+#: ../data/gui/preferences_window.ui.h:127
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../data/glade/preferences_window.glade.h:113
+#: ../data/gui/preferences_window.ui.h:128
 #, fuzzy
 msgid "_Ignore rich content in incoming messages"
 msgstr "忽略收到的消息中的扩展内容"
 
-#: ../data/glade/preferences_window.glade.h:114
+#: ../data/gui/preferences_window.ui.h:129
 msgid "_Log status changes of contacts"
 msgstr "记录联系人状态变化(_L)"
 
-#: ../data/glade/preferences_window.glade.h:115
+#: ../data/gui/preferences_window.ui.h:130
 msgid "_Mail client:"
 msgstr "邮件客户端(_M)："
 
-#: ../data/glade/preferences_window.glade.h:116
+#: ../data/gui/preferences_window.ui.h:131
 #, fuzzy
 msgid "_Not available after:"
 msgstr "自动不可用(_N)："
 
-#: ../data/glade/preferences_window.glade.h:117
+#: ../data/gui/preferences_window.ui.h:132
 msgid "_Open..."
 msgstr "打开...(_O)"
 
-#: ../data/glade/preferences_window.glade.h:118
+#: ../data/gui/preferences_window.ui.h:133
 msgid "_Reset to Default Colors"
 msgstr "恢复为默认颜色设置(_R)"
 
-#: ../data/glade/preferences_window.glade.h:119
+#: ../data/gui/preferences_window.ui.h:134
 #, fuzzy
 msgid "_Send chat state notifications:"
 msgstr "显示聊天状态信息(_F)："
 
-#: ../data/glade/preferences_window.glade.h:120
+#: ../data/gui/preferences_window.ui.h:135
 msgid "_Status message:"
 msgstr "状态消息：(_S)"
 
-#: ../data/glade/preferences_window.glade.h:121
+#: ../data/gui/preferences_window.ui.h:136
 msgid "_URL highlight:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:122
+#: ../data/gui/preferences_window.ui.h:137
 msgid "_Window behavior:"
 msgstr ""
 
-#: ../data/glade/preferences_window.glade.h:123
+#: ../data/gui/preferences_window.ui.h:138
 #, fuzzy
 msgid "in _group chats"
 msgstr "加入群聊(_G)"
 
-#: ../data/glade/preferences_window.glade.h:124
+#: ../data/gui/preferences_window.ui.h:139
 #, fuzzy
 msgid "in _roster"
 msgstr "不在名单中"
 
-#: ../data/glade/preferences_window.glade.h:125
+#: ../data/gui/preferences_window.ui.h:140
 msgid "minutes"
 msgstr "分钟"
 
-#: ../data/glade/privacy_lists_window.glade.h:1
+#: ../data/gui/privacy_lists_window.ui.h:1
 msgid "Privacy Lists:"
 msgstr "私人列表："
 
-#: ../data/glade/privacy_list_window.glade.h:1
+#: ../data/gui/privacy_list_window.ui.h:1
 msgid "<b>Add / Edit a rule</b>"
 msgstr "<b>添加/编辑规则</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:2
+#: ../data/gui/privacy_list_window.ui.h:2
 msgid "<b>List of rules</b>"
 msgstr "<b>规则列表</b>"
 
-#: ../data/glade/privacy_list_window.glade.h:3
+#: ../data/gui/privacy_list_window.ui.h:3
 msgid "<i>Privacy List</i>"
 msgstr "<i>私人列表</i>"
 
-#: ../data/glade/privacy_list_window.glade.h:4
+#: ../data/gui/privacy_list_window.ui.h:4
 msgid "Active for this session"
 msgstr "为此会话激活"
 
-#: ../data/glade/privacy_list_window.glade.h:5
+#: ../data/gui/privacy_list_window.ui.h:5
 msgid "Active on each startup"
 msgstr "每次启动时激活"
 
-#: ../data/glade/privacy_list_window.glade.h:6
+#: ../data/gui/privacy_list_window.ui.h:6
 msgid "All"
 msgstr "全部"
 
-#: ../data/glade/privacy_list_window.glade.h:7
+#: ../data/gui/privacy_list_window.ui.h:7
 #, fuzzy
 msgid "All (including subscription)"
 msgstr "所有认证的"
 
-#: ../data/glade/privacy_list_window.glade.h:8
+#: ../data/gui/privacy_list_window.ui.h:8
 msgid "Allow"
 msgstr "允许"
 
-#: ../data/glade/privacy_list_window.glade.h:9
+#: ../data/gui/privacy_list_window.ui.h:9
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../data/glade/privacy_list_window.glade.h:10
+#: ../data/gui/privacy_list_window.ui.h:10
 msgid "JabberID"
 msgstr "Jabber ID"
 
-#: ../data/glade/privacy_list_window.glade.h:11
+#: ../data/gui/privacy_list_window.ui.h:11
 msgid "Order:"
 msgstr "订阅："
 
-#: ../data/glade/privacy_list_window.glade.h:12 ../src/dialogs.py:3235
+#: ../data/gui/privacy_list_window.ui.h:12 ../src/dialogs.py:3428
 msgid "Privacy List"
 msgstr "私人列表"
 
-#: ../data/glade/privacy_list_window.glade.h:13
+#: ../data/gui/privacy_list_window.ui.h:13
 msgid "all by subscription"
 msgstr "所有认证的"
 
-#: ../data/glade/privacy_list_window.glade.h:14
+#: ../data/gui/privacy_list_window.ui.h:14
 msgid "all in the group"
 msgstr "群组内所有"
 
-#: ../data/glade/privacy_list_window.glade.h:15
-msgid ""
-"none\n"
-"both\n"
-"from\n"
-"to"
-msgstr ""
-"无\n"
-"双向\n"
-"从\n"
-"到"
+#: ../data/gui/privacy_list_window.ui.h:15
+#, fuzzy
+msgid "both"
+msgstr "双方"
+
+#: ../data/gui/privacy_list_window.ui.h:16
+#, fuzzy
+msgid "from"
+msgstr "来自"
+
+#: ../data/gui/privacy_list_window.ui.h:17
+#, fuzzy
+msgid "none"
+msgstr "一"
 
-#: ../data/glade/privacy_list_window.glade.h:19
+#: ../data/gui/privacy_list_window.ui.h:18
+#, fuzzy
+msgid "to"
+msgstr "二"
+
+#: ../data/gui/privacy_list_window.ui.h:19
 msgid "to send me messages"
 msgstr "向我发送消息"
 
-#: ../data/glade/privacy_list_window.glade.h:20
+#: ../data/gui/privacy_list_window.ui.h:20
 msgid "to send me queries"
 msgstr "向我发送查询"
 
-#: ../data/glade/privacy_list_window.glade.h:21
+#: ../data/gui/privacy_list_window.ui.h:21
 msgid "to send me status"
 msgstr "向我发送状态"
 
-#: ../data/glade/privacy_list_window.glade.h:22
+#: ../data/gui/privacy_list_window.ui.h:22
 msgid "to view my status"
 msgstr "查看我的状态"
 
-#: ../data/glade/profile_window.glade.h:1
-#: ../data/glade/vcard_information_window.glade.h:1
+#: ../data/gui/profile_window.ui.h:1
+#: ../data/gui/vcard_information_window.ui.h:1
 #, fuzzy
 msgid "<b>Address</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../data/glade/profile_window.glade.h:2
+#: ../data/gui/profile_window.ui.h:2
 #, fuzzy
 msgid "<b>Avatar:</b>"
 msgstr "明细："
 
-#: ../data/glade/profile_window.glade.h:3
-#: ../data/glade/vcard_information_window.glade.h:4
+#: ../data/gui/profile_window.ui.h:3
+#: ../data/gui/vcard_information_window.ui.h:4
 #, fuzzy
 msgid "<b>Birthday:</b>"
 msgstr "生日"
 
-#: ../data/glade/profile_window.glade.h:4
-#: ../data/glade/vcard_information_window.glade.h:5
+#: ../data/gui/profile_window.ui.h:4
+#: ../data/gui/vcard_information_window.ui.h:5
 #, fuzzy
 msgid "<b>City:</b>"
 msgstr "<b>自定义</b>"
 
-#: ../data/glade/profile_window.glade.h:5
-#: ../data/glade/vcard_information_window.glade.h:7
+#: ../data/gui/profile_window.ui.h:5
+#: ../data/gui/vcard_information_window.ui.h:7
 #, fuzzy
 msgid "<b>Company:</b>"
 msgstr "<b>自定义</b>"
 
-#: ../data/glade/profile_window.glade.h:6
-#: ../data/glade/vcard_information_window.glade.h:9
+#: ../data/gui/profile_window.ui.h:6
+#: ../data/gui/vcard_information_window.ui.h:9
 #, fuzzy
 msgid "<b>Country:</b>"
 msgstr "<b>声音</b>"
 
-#: ../data/glade/profile_window.glade.h:7
-#: ../data/glade/vcard_information_window.glade.h:10
+#: ../data/gui/profile_window.ui.h:7
+#: ../data/gui/vcard_information_window.ui.h:10
 #, fuzzy
 msgid "<b>Department:</b>"
 msgstr "部门："
 
-#: ../data/glade/profile_window.glade.h:8
-#: ../data/glade/vcard_information_window.glade.h:11
+#: ../data/gui/profile_window.ui.h:8
+#: ../data/gui/vcard_information_window.ui.h:11
 #, fuzzy
 msgid "<b>E-Mail:</b>"
 msgstr "E-Mail ："
 
-#: ../data/glade/profile_window.glade.h:9
-#: ../data/glade/vcard_information_window.glade.h:12
+#: ../data/gui/profile_window.ui.h:9
+#: ../data/gui/vcard_information_window.ui.h:12
 #, fuzzy
 msgid "<b>Extra Address:</b>"
 msgstr "附加地址："
 
 #. Family Name
-#: ../data/glade/profile_window.glade.h:11
-#: ../data/glade/vcard_information_window.glade.h:14
+#: ../data/gui/profile_window.ui.h:11
+#: ../data/gui/vcard_information_window.ui.h:14
 #, fuzzy
 msgid "<b>Family:</b>"
 msgstr "家族："
 
-#: ../data/glade/profile_window.glade.h:12
-#: ../data/glade/vcard_information_window.glade.h:15
+#: ../data/gui/profile_window.ui.h:12
+#: ../data/gui/vcard_information_window.ui.h:15
 #, fuzzy
 msgid "<b>Full Name</b>"
 msgstr "<b>自定义</b>"
 
 #. Given Name
-#: ../data/glade/profile_window.glade.h:14
-#: ../data/glade/vcard_information_window.glade.h:17
+#: ../data/gui/profile_window.ui.h:14
+#: ../data/gui/vcard_information_window.ui.h:17
 #, fuzzy
 msgid "<b>Given:</b>"
 msgstr "<b>OpenPGP</b>"
 
-#: ../data/glade/profile_window.glade.h:15
-#: ../data/glade/vcard_information_window.glade.h:18
+#: ../data/gui/profile_window.ui.h:15
+#: ../data/gui/vcard_information_window.ui.h:18
 #, fuzzy
 msgid "<b>Homepage:</b>"
 msgstr "主页："
 
 #. Middle Name
-#: ../data/glade/profile_window.glade.h:17
-#: ../data/glade/vcard_information_window.glade.h:21
+#: ../data/gui/profile_window.ui.h:17
+#: ../data/gui/vcard_information_window.ui.h:21
 #, fuzzy
 msgid "<b>Middle:</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../data/glade/profile_window.glade.h:18
-#: ../data/glade/vcard_information_window.glade.h:22
+#: ../data/gui/profile_window.ui.h:18
+#: ../data/gui/vcard_information_window.ui.h:22
 #, fuzzy
 msgid "<b>Name:</b>"
 msgstr "<b>自定义</b>"
 
-#: ../data/glade/profile_window.glade.h:19
-#: ../data/glade/vcard_information_window.glade.h:23
+#: ../data/gui/profile_window.ui.h:19
+#: ../data/gui/vcard_information_window.ui.h:23
 #, fuzzy
 msgid "<b>Nickname:</b>"
 msgstr "昵称："
 
-#: ../data/glade/profile_window.glade.h:20
-#: ../data/glade/vcard_information_window.glade.h:24
+#: ../data/gui/profile_window.ui.h:20
+#: ../data/gui/vcard_information_window.ui.h:24
 #, fuzzy
 msgid "<b>Phone No.:</b>"
 msgstr "电话号码："
 
-#: ../data/glade/profile_window.glade.h:21
-#: ../data/glade/vcard_information_window.glade.h:25
+#: ../data/gui/profile_window.ui.h:21
+#: ../data/gui/vcard_information_window.ui.h:25
 #, fuzzy
 msgid "<b>Position:</b>"
 msgstr "<b>条件</b>"
 
-#: ../data/glade/profile_window.glade.h:22
-#: ../data/glade/vcard_information_window.glade.h:26
+#: ../data/gui/profile_window.ui.h:22
+#: ../data/gui/vcard_information_window.ui.h:26
 #, fuzzy
 msgid "<b>Postal Code:</b>"
 msgstr "邮政编码："
 
 #. Prefix in Name
-#: ../data/glade/profile_window.glade.h:24
-#: ../data/glade/vcard_information_window.glade.h:28
+#: ../data/gui/profile_window.ui.h:24
+#: ../data/gui/vcard_information_window.ui.h:28
 #, fuzzy
 msgid "<b>Prefix:</b>"
 msgstr "<b>属性</b>"
 
-#: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:332
+#: ../data/gui/profile_window.ui.h:25
+#: ../data/gui/vcard_information_window.ui.h:30 ../src/vcard.py:331
 #, fuzzy
 msgid "<b>Role:</b>"
 msgstr "<b>声音</b>"
 
-#: ../data/glade/profile_window.glade.h:26
-#: ../data/glade/vcard_information_window.glade.h:31
+#: ../data/gui/profile_window.ui.h:26
+#: ../data/gui/vcard_information_window.ui.h:31
 #, fuzzy
 msgid "<b>State:</b>"
 msgstr "<b>设置</b>"
 
-#: ../data/glade/profile_window.glade.h:27
-#: ../data/glade/vcard_information_window.glade.h:33
+#: ../data/gui/profile_window.ui.h:27
+#: ../data/gui/vcard_information_window.ui.h:33
 #, fuzzy
 msgid "<b>Street:</b>"
 msgstr "<b>设置</b>"
 
 #. Suffix in Name
-#: ../data/glade/profile_window.glade.h:29
-#: ../data/glade/vcard_information_window.glade.h:37
+#: ../data/gui/profile_window.ui.h:29
+#: ../data/gui/vcard_information_window.ui.h:37
 #, fuzzy
 msgid "<b>Suffix:</b>"
 msgstr "<b>声音</b>"
 
 #. "About" is the text of a tab of vcard window
-#: ../data/glade/profile_window.glade.h:31
-#: ../data/glade/vcard_information_window.glade.h:40
+#: ../data/gui/profile_window.ui.h:31
+#: ../data/gui/vcard_information_window.ui.h:40
 msgid "About"
 msgstr "关于"
 
-#: ../data/glade/profile_window.glade.h:32
+#: ../data/gui/profile_window.ui.h:32
 msgid "Click to set your avatar"
 msgstr "单击以设置您的明细"
 
-#. Do NOT change sequence. Just translate YYYY and MM and DD (from Year, Month, Day accordingly)
-#: ../data/glade/profile_window.glade.h:34
-#: ../data/glade/vcard_information_window.glade.h:46
+#: ../data/gui/profile_window.ui.h:33
+#: ../data/gui/vcard_information_window.ui.h:45
 msgid "Format: YYYY-MM-DD"
 msgstr "格式： YYYY-MM-DD"
 
-#: ../data/glade/profile_window.glade.h:35
-#: ../data/glade/vcard_information_window.glade.h:48
+#: ../data/gui/profile_window.ui.h:34
+#: ../data/gui/vcard_information_window.ui.h:47
 msgid "Personal Info"
 msgstr "个人信息"
 
-#: ../data/glade/profile_window.glade.h:37
-#: ../data/glade/vcard_information_window.glade.h:50
+#: ../data/gui/profile_window.ui.h:36
+#: ../data/gui/vcard_information_window.ui.h:49
 msgid "Work"
 msgstr "工作"
 
-#: ../data/glade/remove_account_window.glade.h:1
+#: ../data/gui/remove_account_window.ui.h:1
 msgid "<b>What do you want to do?</b>"
 msgstr "<b>想做什么？</b>"
 
-#: ../data/glade/remove_account_window.glade.h:2
+#: ../data/gui/remove_account_window.ui.h:2
 msgid "Remove account _only from Gajim"
 msgstr "仅从 Gajim 移除帐户(_O)"
 
-#: ../data/glade/remove_account_window.glade.h:3
+#: ../data/gui/remove_account_window.ui.h:3
 msgid "Remove account from Gajim and from _server"
 msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5256
-#: ../src/roster_window.py:5380 ../src/roster_window.py:5511
+#: ../data/gui/remove_account_window.ui.h:4 ../src/roster_window.py:5363
+#: ../src/roster_window.py:5489 ../src/roster_window.py:5619
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:1
+#: ../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 ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:2
+#: ../data/gui/roster_item_exchange_window.ui.h:2
 msgid "Message Body <currently unused, so it's hidden by default>"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:3
 msgid "Roster Item Exchange"
 msgstr ""
 
-#: ../data/glade/roster_item_exchange_window.glade.h:4
-#: ../data/glade/service_registration_window.glade.h:3
+#: ../data/gui/roster_item_exchange_window.ui.h:4
+#: ../data/gui/service_registration_window.ui.h:3
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../data/glade/roster_item_exchange_window.glade.h:5
-#, fuzzy
-msgid "gtk-cancel"
-msgstr "删除"
-
-#: ../data/glade/roster_window.glade.h:1
-#, fuzzy
-msgid "Add _Contact..."
-msgstr "添加联系人(_A)..."
-
-#: ../data/glade/roster_window.glade.h:2
-#, fuzzy
-msgid "Fea_tures"
-msgstr "服务器设定"
-
-#: ../data/glade/roster_window.glade.h:3
-msgid "File _Transfers"
-msgstr "文件传输(_T)"
-
-#: ../data/glade/roster_window.glade.h:4
+#: ../data/gui/roster_window.ui.h:1
 msgid "Frequently Asked Questions (online)"
 msgstr "被频繁提问的问题 (在线)"
 
-#: ../data/glade/roster_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:3
 msgid "Help online"
 msgstr "在线帮助"
 
-#: ../data/glade/roster_window.glade.h:8
-msgid "Profile, A_vatar"
-msgstr "模板，明细(V)"
-
-#: ../data/glade/roster_window.glade.h:9
+#: ../data/gui/roster_window.ui.h:4
 #, fuzzy
 msgid "Show Only _Active Contacts"
 msgstr "显示离线联系人"
 
-#: ../data/glade/roster_window.glade.h:10
+#: ../data/gui/roster_window.ui.h:5
 msgid "Show Trans_ports"
 msgstr "显示代理(_P)"
 
-#: ../data/glade/roster_window.glade.h:11
+#: ../data/gui/roster_window.ui.h:6
 msgid "Show _Offline Contacts"
 msgstr "显示离线联系人"
 
-#: ../data/glade/roster_window.glade.h:12
-#: ../data/glade/systray_context_menu.glade.h:4
+#: ../data/gui/roster_window.ui.h:7 ../src/statusicon.py:326
 msgid "Show _Roster"
 msgstr "显示名单(_R)"
 
-#: ../data/glade/roster_window.glade.h:13
-#, fuzzy
-msgid "_Accounts"
-msgstr "帐户"
-
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
-#: ../data/glade/roster_window.glade.h:14
-#: ../data/glade/subscription_request_window.glade.h:6
+#: ../data/gui/roster_window.ui.h:8
+#: ../data/gui/subscription_request_window.ui.h:6
 msgid "_Actions"
 msgstr "动作(_A)"
 
-#: ../data/glade/roster_window.glade.h:16
-msgid "_Contents"
-msgstr "内容(_C)"
-
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1467
+#: ../data/gui/roster_window.ui.h:10 ../src/disco.py:1504
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../data/glade/roster_window.glade.h:19
-msgid "_FAQ"
-msgstr "常见问题(_A)"
-
-#: ../data/glade/roster_window.glade.h:20
+#: ../data/gui/roster_window.ui.h:11
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../data/glade/roster_window.glade.h:22
-msgid "_Preferences"
-msgstr "首选项(_P)"
-
-#: ../data/glade/roster_window.glade.h:23
-msgid "_Quit"
-msgstr "退出(_Q)"
-
-#: ../data/glade/roster_window.glade.h:24
-#, fuzzy
-msgid "_Send Single Message..."
-msgstr "发送一条消息...(_M)"
-
-#: ../data/glade/roster_window.glade.h:26
+#: ../data/gui/roster_window.ui.h:12
 msgid "_View"
 msgstr "视图(_V)"
 
-#: ../data/glade/search_window.glade.h:1
+#: ../data/gui/search_window.ui.h:1
 #, fuzzy
 msgid "Please wait while retrieving search form..."
 msgstr "请等待日志被移动..."
 
-#: ../data/glade/search_window.glade.h:2
+#: ../data/gui/search_window.ui.h:2
 msgid "Search"
 msgstr "查找"
 
-#: ../data/glade/search_window.glade.h:3
+#: ../data/gui/search_window.ui.h:3
 #, fuzzy
 msgid "_Add contact"
 msgstr "添加联系人(_C)"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5523
+#: ../data/gui/search_window.ui.h:4 ../src/roster_window.py:5631
 #, fuzzy
 msgid "_Information"
 msgstr "联系人信息"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1318
+#: ../data/gui/search_window.ui.h:5 ../src/disco.py:1355
 msgid "_Search"
 msgstr "查找(_S)"
 
-#: ../data/glade/service_discovery_window.glade.h:1
+#: ../data/gui/service_discovery_window.ui.h:1
 msgid "G_o"
 msgstr "到(_O)"
 
-#: ../data/glade/service_discovery_window.glade.h:2
+#: ../data/gui/service_discovery_window.ui.h:2
 msgid "_Address:"
 msgstr "地址(_A):"
 
-#: ../data/glade/service_registration_window.glade.h:1
+#: ../data/gui/service_registration_window.ui.h:1
 msgid "Register to"
 msgstr "注册到"
 
-#: ../data/glade/service_registration_window.glade.h:2
+#: ../data/gui/service_registration_window.ui.h:2
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../data/glade/single_message_window.glade.h:1
-msgid "0"
-msgstr "0"
-
-#: ../data/glade/single_message_window.glade.h:2
+#: ../data/gui/single_message_window.ui.h:2
 msgid "From:"
 msgstr "从："
 
-#: ../data/glade/single_message_window.glade.h:3
+#: ../data/gui/single_message_window.ui.h:3
 msgid "Reply to this message"
 msgstr "回复本条消息"
 
-#: ../data/glade/single_message_window.glade.h:4
+#: ../data/gui/single_message_window.ui.h:4
 msgid "Sen_d"
 msgstr "发送(_D)"
 
-#: ../data/glade/single_message_window.glade.h:5
+#: ../data/gui/single_message_window.ui.h:5
 msgid "Send message"
 msgstr "发送消息"
 
-#: ../data/glade/single_message_window.glade.h:6
+#: ../data/gui/single_message_window.ui.h:6
 msgid "Send message and close window"
 msgstr "发送消息并关闭窗口"
 
-#: ../data/glade/single_message_window.glade.h:7
+#: ../data/gui/single_message_window.ui.h:7
 msgid "Subject:"
 msgstr "主题："
 
-#: ../data/glade/single_message_window.glade.h:8
+#: ../data/gui/single_message_window.ui.h:8
 msgid "To:"
 msgstr "到："
 
-#: ../data/glade/single_message_window.glade.h:9
+#: ../data/gui/single_message_window.ui.h:9
 msgid "_Reply"
 msgstr "回复(_R)"
 
-#: ../data/glade/single_message_window.glade.h:10
+#: ../data/gui/single_message_window.ui.h:10
 msgid "_Send & Close"
 msgstr "发送并关闭(_S)"
 
-#: ../data/glade/subscription_request_window.glade.h:1
+#: ../data/gui/subscription_request_window.ui.h:1
 msgid "Au_thorize"
 msgstr "授权(_V)"
 
-#: ../data/glade/subscription_request_window.glade.h:2
+#: ../data/gui/subscription_request_window.ui.h:2
 #, fuzzy
 msgid "Authorize contact so he or she can know when you're connected"
 msgstr "向联系人授权，使他知道您是否连接"
 
-#: ../data/glade/subscription_request_window.glade.h:3
+#: ../data/gui/subscription_request_window.ui.h:3
 #, fuzzy
 msgid ""
 "Deny authorization from contact so he or she cannot know when you're "
 "connected"
 msgstr "拒绝向联系人授权。他人将无法知道您是否在线"
 
-#: ../data/glade/subscription_request_window.glade.h:4
+#: ../data/gui/subscription_request_window.ui.h:4
 msgid "Subscription Request"
 msgstr "认证请求"
 
-#: ../data/glade/subscription_request_window.glade.h:7
+#: ../data/gui/subscription_request_window.ui.h:7
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
-#: ../data/glade/synchronise_select_account_dialog.glade.h:1
+#: ../data/gui/synchronise_select_account_dialog.ui.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr ""
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:1
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:1
 #, fuzzy
 msgid "Select the contacts you want to synchronise"
 msgstr "您想聊天的 JID"
 
-#: ../data/glade/synchronise_select_contacts_dialog.glade.h:2
+#: ../data/gui/synchronise_select_contacts_dialog.ui.h:2
 msgid "Synchronise : select contacts"
 msgstr ""
 
-#: ../data/glade/systray_context_menu.glade.h:1
+#: ../data/gui/systray_context_menu.ui.h:1
 msgid "Mute Sounds"
 msgstr "静间"
 
-#: ../data/glade/systray_context_menu.glade.h:2
-msgid "Send Single _Message"
-msgstr "发送单条消息(_M)"
-
-#: ../data/glade/systray_context_menu.glade.h:3
+#: ../data/gui/systray_context_menu.ui.h:2
 msgid "Show All Pending _Events"
 msgstr "显示所有未决事件"
 
-#: ../data/glade/systray_context_menu.glade.h:5
-msgid "Sta_tus"
-msgstr "状态(_T)"
-
-#: ../data/glade/systray_context_menu.glade.h:6
-msgid "_Group Chat"
-msgstr "群聊(_G)"
-
 #. Given Name
-#: ../data/glade/vcard_information_window.glade.h:3
+#: ../data/gui/vcard_information_window.ui.h:3
 #, fuzzy
 msgid "<b>Ask:</b>"
 msgstr "<b>动作</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:6
+#: ../data/gui/vcard_information_window.ui.h:6
 #, fuzzy
 msgid "<b>Client:</b>"
 msgstr "<b>自定义</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:8
+#: ../data/gui/vcard_information_window.ui.h:8
 #, fuzzy
 msgid "<b>Contact time:</b>"
 msgstr "<b>设置</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:19
+#: ../data/gui/vcard_information_window.ui.h:19
 #, fuzzy
 msgid "<b>Jabber ID:</b>"
 msgstr "Jabber ID"
 
-#: ../data/glade/vcard_information_window.glade.h:29
+#: ../data/gui/vcard_information_window.ui.h:29
 #, fuzzy
 msgid "<b>Resource:</b>"
 msgstr "资源："
 
-#: ../data/glade/vcard_information_window.glade.h:32
+#: ../data/gui/vcard_information_window.ui.h:32
 #, fuzzy
 msgid "<b>Status:</b>"
 msgstr "<b>设置</b>"
 
 #. Family Name
-#: ../data/glade/vcard_information_window.glade.h:35
+#: ../data/gui/vcard_information_window.ui.h:35
 #, fuzzy
 msgid "<b>Subscription:</b>"
 msgstr "<b>描述</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:38
+#: ../data/gui/vcard_information_window.ui.h:38
 #, fuzzy
 msgid "<b>System:</b>"
 msgstr "<b>自定义</b>"
 
-#: ../data/glade/vcard_information_window.glade.h:41
+#: ../data/gui/vcard_information_window.ui.h:41
 msgid "Comments"
 msgstr "注释"
 
-#: ../data/glade/vcard_information_window.glade.h:42
+#: ../data/gui/vcard_information_window.ui.h:42
 #, fuzzy
 msgid "Configured avatar:"
 msgstr "设置房间(_R)"
 
-#: ../data/glade/vcard_information_window.glade.h:43
-#: ../data/glade/zeroconf_information_window.glade.h:1
+#: ../data/gui/vcard_information_window.ui.h:43
+#: ../data/gui/zeroconf_information_window.ui.h:1
 msgid "Contact"
 msgstr "联系人"
 
-#: ../data/glade/vcard_information_window.glade.h:44
+#: ../data/gui/vcard_information_window.ui.h:44
 msgid "Contact Information"
 msgstr "联系人信息"
 
-#: ../data/glade/vcard_information_window.glade.h:47
+#: ../data/gui/vcard_information_window.ui.h:46
 msgid "More"
 msgstr "更多"
 
-#: ../data/glade/vcard_information_window.glade.h:49
+#: ../data/gui/vcard_information_window.ui.h:48
 #, fuzzy
 msgid "User avatar:"
 msgstr "选择明细"
 
-#: ../data/glade/xml_console_window.glade.h:1
+#: ../data/gui/xml_console_window.ui.h:1
+#, fuzzy
+msgid "<b>Filter</b>"
+msgstr "<b>声音</b>"
+
+#: ../data/gui/xml_console_window.ui.h:2
 msgid "<b>Jabber Traffic</b>"
 msgstr "<b>Jabber 通信</b>"
 
-#: ../data/glade/xml_console_window.glade.h:2
+#: ../data/gui/xml_console_window.ui.h:3
 msgid "<b>XML Input</b>"
 msgstr "<b>XML 输入</b>"
 
-#. XML Console enable checkbutton
-#: ../data/glade/xml_console_window.glade.h:4
-msgid "Enable"
-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"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:6
+msgid "Hide Message stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:7
+msgid "Hide OUT stanzas"
+msgstr ""
+
+#: ../data/gui/xml_console_window.ui.h:8
+msgid "Hide Presence stanzas"
+msgstr ""
 
-#. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../data/glade/xml_console_window.glade.h:6
+#: ../data/gui/xml_console_window.ui.h:9
 msgid "Info/Query"
 msgstr "信息/查询"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../data/glade/xml_console_window.glade.h:8
+#: ../data/gui/xml_console_window.ui.h:13
 msgid "_IQ"
 msgstr "IQ(_I)"
 
-#: ../data/glade/xml_console_window.glade.h:9
+#: ../data/gui/xml_console_window.ui.h:14
 msgid "_Message"
 msgstr "消息(_M)"
 
-#: ../data/glade/xml_console_window.glade.h:10
+#: ../data/gui/xml_console_window.ui.h:15
 msgid "_Presence"
 msgstr "在场(_P)"
 
-#: ../data/glade/zeroconf_context_menu.glade.h:1
-msgid "_Modify Account..."
-msgstr "修改帐户(_M)..."
-
-#: ../data/glade/zeroconf_information_window.glade.h:6
+#: ../data/gui/zeroconf_information_window.ui.h:6
 msgid "Local jid:"
 msgstr "本地 JID："
 
-#: ../data/glade/zeroconf_information_window.glade.h:7
+#: ../data/gui/zeroconf_information_window.ui.h:7
 msgid "Personal"
 msgstr "个人"
 
-#: ../data/glade/zeroconf_information_window.glade.h:8
+#: ../data/gui/zeroconf_information_window.ui.h:8
 msgid "Resource:"
 msgstr "资源："
 
-#: ../data/glade/zeroconf_information_window.glade.h:9
+#: ../data/gui/zeroconf_information_window.ui.h:9
 msgid "Status:"
 msgstr "状态："
 
-#: ../src/adhoc_commands.py:295
+#: ../data/gajim.desktop.in.in.h:1
+msgid "A GTK+ Jabber client"
+msgstr "一个 GTK+ 的 Jabber 客户端"
+
+#: ../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:298
 #, fuzzy
 msgid "Cancel confirmation"
 msgstr "联系人信息"
 
-#: ../src/adhoc_commands.py:296
+#: ../src/adhoc_commands.py:299
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr ""
 
-#: ../src/adhoc_commands.py:328 ../src/adhoc_commands.py:351
+#: ../src/adhoc_commands.py:331 ../src/adhoc_commands.py:354
 msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:337
+#: ../src/adhoc_commands.py:340
 msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:436
+#: ../src/adhoc_commands.py:441
 msgid "Service returned an error."
 msgstr ""
 
@@ -3002,7 +2861,7 @@ msgstr "群组内"
 msgid "Text"
 msgstr "文本"
 
-#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:879
+#: ../src/advanced_configuration_window.py:96 ../src/chat_control.py:903
 msgid "Color"
 msgstr ""
 
@@ -3145,134 +3004,134 @@ msgstr "Swedish"
 msgid "Chinese (Ch)"
 msgstr "中文"
 
-#: ../src/chat_control.py:446
+#: ../src/chat_control.py:450
 msgid "Spelling language"
 msgstr "拼写检查"
 
 #. we are not connected
-#: ../src/chat_control.py:478 ../src/chat_control.py:670
+#: ../src/chat_control.py:482 ../src/chat_control.py:691
 msgid "A connection is not available"
 msgstr "连接不可用"
 
-#: ../src/chat_control.py:479 ../src/chat_control.py:671
+#: ../src/chat_control.py:483 ../src/chat_control.py:692
 msgid "Your message can not be sent until you are connected."
 msgstr "连接之后您的消息才能发送"
 
-#: ../src/chat_control.py:861
+#: ../src/chat_control.py:885
 #, fuzzy
 msgid "Underline"
 msgstr "下划线"
 
-#: ../src/chat_control.py:862
+#: ../src/chat_control.py:886
 #, fuzzy
 msgid "Strike"
 msgstr "昵称"
 
-#: ../src/chat_control.py:885
+#: ../src/chat_control.py:909
 #, fuzzy
 msgid "Font"
 msgstr "字号：(_F)"
 
-#: ../src/chat_control.py:894
+#: ../src/chat_control.py:918
 #, fuzzy
 msgid "Clear formating"
 msgstr "联系人信息"
 
-#: ../src/chat_control.py:972
+#: ../src/chat_control.py:996
 msgid "Really send file?"
 msgstr ""
 
-#: ../src/chat_control.py:973
+#: ../src/chat_control.py:997
 #, python-format
 msgid "If you send a file to %s, he/she will know your real Jabber ID."
 msgstr ""
 
-#: ../src/chat_control.py:1411 ../src/chat_control.py:1864
+#: ../src/chat_control.py:1450 ../src/chat_control.py:1947
 #, fuzzy
 msgid "GPG encryption enabled"
 msgstr "启用加密"
 
 #. Add to roster
-#: ../src/chat_control.py:1436 ../src/common/contacts.py:150
-#: ../src/common/contacts.py:253 ../src/common/helpers.py:55
-#: ../src/common/helpers.py:231 ../src/conversation_textview.py:916
-#: ../src/dialogs.py:1060 ../src/dialogs.py:1973 ../src/dialogs.py:2002
-#: ../src/gui_interface.py:610 ../src/gui_menu_builder.py:255
-#: ../src/gui_menu_builder.py:398 ../src/roster_window.py:1576
-#: ../src/roster_window.py:1578 ../src/roster_window.py:1893
-#: ../src/roster_window.py:3194 ../src/roster_window.py:3220
+#: ../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
 msgid "Not in Roster"
 msgstr "不在名单中"
 
-#: ../src/chat_control.py:1480
+#: ../src/chat_control.py:1519
 #, fuzzy
 msgid "This contact does not support file transfer."
 msgstr "文件发送、完成和中止的清单"
 
-#: ../src/chat_control.py:1483
+#: ../src/chat_control.py:1522
 msgid "You need to know the real JID of the contact to send him or her a file."
 msgstr ""
 
-#: ../src/chat_control.py:1555
+#: ../src/chat_control.py:1611
 #, python-format
 msgid "%(type)s state : %(state)s, reason: %(reason)s"
 msgstr ""
 
-#: ../src/chat_control.py:1720
+#: ../src/chat_control.py:1812
 #, 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:1844 ../src/dialogs.py:4627
+#: ../src/chat_control.py:1927 ../src/dialogs.py:4814
 msgid "No GPG key assigned"
 msgstr ""
 
-#: ../src/chat_control.py:1845
+#: ../src/chat_control.py:1928
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
 msgstr ""
 
-#: ../src/chat_control.py:1854
+#: ../src/chat_control.py:1937
 #, fuzzy
 msgid "GPG encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:1880
+#: ../src/chat_control.py:1963
 msgid "Session WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:1882
+#: ../src/chat_control.py:1965
 msgid "Session WILL NOT be logged"
 msgstr ""
 
 #. encryption %s active
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is"
 msgstr ""
 
-#: ../src/chat_control.py:1899
+#: ../src/chat_control.py:1982
 msgid "is NOT"
 msgstr ""
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will"
 msgstr ""
 
-#: ../src/chat_control.py:1901
+#: ../src/chat_control.py:1984
 msgid "will NOT"
 msgstr ""
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1905
+#: ../src/chat_control.py:1988
 #, fuzzy
 msgid "and authenticated"
 msgstr "使用验证"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1909
+#: ../src/chat_control.py:1992
 #, fuzzy
 msgid "and NOT authenticated"
 msgstr "使用验证"
@@ -3280,193 +3139,203 @@ 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:1915
+#: ../src/chat_control.py:1999
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
 "Your chat session %(logged)s be logged."
 msgstr ""
 
-#: ../src/chat_control.py:2055
+#: ../src/chat_control.py:2139
 msgid "Session negotiation cancelled"
 msgstr ""
 
-#: ../src/chat_control.py:2064
+#: ../src/chat_control.py:2148
 #, fuzzy
 msgid "This session is encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:2067
+#: ../src/chat_control.py:2151
 msgid " and WILL be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2069
+#: ../src/chat_control.py:2153
 msgid " and WILL NOT be logged"
 msgstr ""
 
-#: ../src/chat_control.py:2074
+#: ../src/chat_control.py:2158
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
 msgstr ""
 
-#: ../src/chat_control.py:2076
+#: ../src/chat_control.py:2160
 #, fuzzy
 msgid "E2E encryption disabled"
 msgstr "禁用加密"
 
-#: ../src/chat_control.py:2113 ../src/chat_control.py:2126
+#: ../src/chat_control.py:2197 ../src/chat_control.py:2210
 #, fuzzy
 msgid "The following message was NOT encrypted"
 msgstr "[本条消息已加密]"
 
-#: ../src/chat_control.py:2119
+#: ../src/chat_control.py:2203
 #, fuzzy
 msgid "The following message was encrypted"
 msgstr "[本条消息已加密]"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2388
+#: ../src/chat_control.py:2475
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "收到一条来自 “%s” 的消息"
 
-#: ../src/chat_control.py:2389
+#: ../src/chat_control.py:2476
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/chat_control.py:2542 ../src/common/connection_handlers.py:2100
-#: ../src/common/connection_handlers.py:2146
-#: ../src/common/connection_handlers.py:2338
-#: ../src/common/connection_handlers.py:2483 ../src/common/connection.py:420
-#: ../src/gajim.py:154 ../src/session.py:134
+#: ../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
 msgid "Database Error"
 msgstr ""
 
-#: ../src/chat_control.py:2543
+#: ../src/chat_control.py:2620
 #, 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:2784
+#: ../src/chat_control.py:2858
 #, fuzzy, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
 
-#: ../src/common/check_paths.py:44
+#: ../src/common/check_paths.py:37
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: ../src/common/check_paths.py:129 ../src/common/check_paths.py:140
-#: ../src/common/check_paths.py:147
+#: ../src/common/check_paths.py:85
+#, fuzzy
+msgid "creating cache database"
+msgstr "建立日志数据库"
+
+#: ../src/common/check_paths.py:274 ../src/common/check_paths.py:281
+#: ../src/common/check_paths.py:288 ../src/common/check_paths.py:295
+#: ../src/common/check_paths.py:302 ../src/common/check_paths.py:309
+#: ../src/common/check_paths.py:324
 #, fuzzy, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s 应为文件但它应为一个目录"
 
-#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:141
-#: ../src/common/check_paths.py:148 ../src/common/check_paths.py:156
+#: ../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
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
-#: ../src/common/check_paths.py:155
+#: ../src/common/check_paths.py:317 ../src/common/check_paths.py:332
 #, fuzzy, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s 应为文件但它是一个目录"
 
-#: ../src/common/check_paths.py:171
+#: ../src/common/check_paths.py:337
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目录"
 
-#: ../src/common/commands.py:79
+#: ../src/common/commands.py:82
 #, fuzzy
 msgid "Change status information"
 msgstr "联系人信息"
 
-#: ../src/common/commands.py:92
+#: ../src/common/commands.py:97
 #, fuzzy
 msgid "Change status"
 msgstr "联系人状态改变"
 
-#: ../src/common/commands.py:93
+#: ../src/common/commands.py:98
 msgid "Set the presence type and description"
 msgstr ""
 
-#: ../src/common/commands.py:99
+#: ../src/common/commands.py:104
 #, fuzzy
 msgid "Free for chat"
 msgstr "自由聊天"
 
-#: ../src/common/commands.py:100
+#: ../src/common/commands.py:105
 #, fuzzy
 msgid "Online"
 msgstr "九"
 
-#: ../src/common/commands.py:102
+#: ../src/common/commands.py:107
 msgid "Extended away"
 msgstr ""
 
-#: ../src/common/commands.py:103
+#: ../src/common/commands.py:108
 #, fuzzy
 msgid "Do not disturb"
 msgstr "不分发。"
 
-#: ../src/common/commands.py:104
+#: ../src/common/commands.py:109
 msgid "Offline - disconnect"
 msgstr ""
 
-#: ../src/common/commands.py:109
+#: ../src/common/commands.py:114
 #, fuzzy
 msgid "Presence description:"
 msgstr "描述"
 
-#: ../src/common/commands.py:144
+#: ../src/common/commands.py:149
 msgid "The status has been changed."
 msgstr ""
 
-#: ../src/common/commands.py:176 ../src/common/commands.py:200
+#: ../src/common/commands.py:181 ../src/common/commands.py:207
 #, fuzzy
 msgid "Leave Groupchats"
 msgstr "新群聊"
 
-#: ../src/common/commands.py:190
+#: ../src/common/commands.py:197
 #, fuzzy, python-format
 msgid "%(nickname)s on %(room_jid)s"
 msgstr "群聊 %(room_name)s 的 %(nickname)s"
 
-#: ../src/common/commands.py:194
+#: ../src/common/commands.py:201
 #, fuzzy
 msgid "You have not joined a groupchat."
 msgstr "%s 加入群聊"
 
-#: ../src/common/commands.py:201
+#: ../src/common/commands.py:208
 msgid "Choose the groupchats you want to leave"
 msgstr ""
 
 #. Make special context menu if group is Groupchats
-#: ../src/common/commands.py:205 ../src/common/contacts.py:131
-#: ../src/common/helpers.py:55 ../src/roster_window.py:809
-#: ../src/roster_window.py:1580 ../src/roster_window.py:1582
-#: ../src/roster_window.py:5144
+#: ../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
 #, fuzzy
 msgid "Groupchats"
 msgstr "群聊"
 
-#: ../src/common/commands.py:246
+#: ../src/common/commands.py:253
 #, fuzzy
 msgid "You left the following groupchats:"
 msgstr "您已经在群聊房间 %s 。"
 
-#: ../src/common/commands.py:258
+#: ../src/common/commands.py:265
 #, fuzzy
 msgid "Forward unread messages"
 msgstr " %d 条未读消息 "
 
-#: ../src/common/commands.py:278
+#: ../src/common/commands.py:287
 msgid "All unread messages have been forwarded."
 msgstr ""
 
@@ -3563,9 +3432,9 @@ msgid ""
 msgstr "折叠的列(账户和组)的列表(空格分隔)。"
 
 #. sorted alphanum
-#: ../src/common/config.py:106 ../src/common/config.py:482
-#: ../src/common/optparser.py:288 ../src/common/optparser.py:465
-#: ../src/common/optparser.py:499 ../src/gui_interface.py:3251
+#: ../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
 #, fuzzy
 msgid "default"
 msgstr "默认"
@@ -3814,23 +3683,23 @@ msgstr ""
 "如选是， Gajim 将显示状态消息，如果不为空，将在名单窗口中每一个联系人名字的下"
 "方显示状态信息。"
 
-#: ../src/common/config.py:228
+#: ../src/common/config.py:229
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:229
+#: ../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."
 msgstr "如选是， Gajim 会为每一个缓存过久或上次未获得明细的联系人请求明细"
 
-#: ../src/common/config.py:230
+#: ../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."
 msgstr "如选否，您将不再打印聊天中的联系人变更其状态和状态消息的状态行。"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:232
 #, fuzzy
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
@@ -3843,28 +3712,28 @@ msgstr ""
 "状态或他/她的状态消息时 Gajim 将不再打印状态行。如果是 \"全部\" Gajim 将打印"
 "所有的状态消息。如果是 \"登入与登出\"， Gajim 将只打印群聊中登入与登出消息。"
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:234
 msgid "Background color of contacts when they just signed in."
 msgstr "当联系人登入时的背景色。"
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:235
 msgid "Background color of contacts when they just signed out."
 msgstr "当联系人登出时的背景色。"
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:237
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr "如果为真，还原消息将用较小的字体。"
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:238
 msgid "Don't show avatar for the transport itself."
 msgstr "不显示代理本身的明细。"
 
-#: ../src/common/config.py:238
+#: ../src/common/config.py:239
 msgid "Don't show roster in the system taskbar."
 msgstr "不在系统任务栏显示名单。"
 
-#: ../src/common/config.py:239
+#: ../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 "
@@ -3873,7 +3742,7 @@ msgstr ""
 "如选是并且 GTK+ 和 PyGTK 版本高于2.8，当有未决事件时窗口将会闪动(大部分窗口管"
 "理器的默认响应)"
 
-#: ../src/common/config.py:241
+#: ../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 "
@@ -3883,7 +3752,7 @@ msgstr ""
 "止在群聊中发送 SHA 信息。"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:244
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3902,79 +3771,79 @@ msgstr ""
 "'每种类型' - 每种类型的消息 (例如, 单独聊天 及 群聊) 都发送到一个单独的窗口。"
 "注意，改变该选项后必须重启 Gajim 使设置生效。"
 
-#: ../src/common/config.py:245
+#: ../src/common/config.py:246
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "如选否，您将不会在窗口中看到明细。"
 
-#: ../src/common/config.py:246
+#: ../src/common/config.py:247
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "如选是，按 Escape 键关闭标签/窗口。"
 
-#: ../src/common/config.py:247
+#: ../src/common/config.py:248
 #, fuzzy
 msgid "Hides the buttons in chat windows."
 msgstr "在群聊窗口中隐藏按钮。"
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:249
 msgid "Hides the banner in a group chat window"
 msgstr "在群聊窗口中隐藏标语"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:250
 msgid "Hides the banner in two persons chat window"
 msgstr "在双人聊天窗口中隐藏标语"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:251
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "在群聊窗口中隐藏房主列表。"
 
-#: ../src/common/config.py:251
+#: ../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."
 msgstr "在聊天中，只在当前一条消息不是同一人发出的的时候在一行前显示昵称。"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:253
 #, fuzzy
 msgid "Indentation when using merge consecutive nickname."
 msgstr "当合并连续昵称时缩进。"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:254
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "发送消息并关闭窗口"
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:255
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
 "group chats."
 msgstr "将会在群聊中使用彩色昵称的颜色列表。"
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:256
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "当没有新消息时按 Ctrl-Tab 转到下一个撰写标签。"
 
-#: ../src/common/config.py:256
+#: ../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:257
+#: ../src/common/config.py:258
 #, fuzzy
 msgid ""
 "Should we show the confirm block contact dialog or not? Empty string means "
 "we never show the dialog."
 msgstr "是否显示确认元联系人创建对话框？空字符串意味着从不显示对话框。"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:259
 #, fuzzy
 msgid ""
 "Should we show the confirm custom status dialog or not? Empty string means "
 "we never show the dialog."
 msgstr "是否显示确认元联系人创建对话框？空字符串意味着从不显示对话框。"
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:260
 #, fuzzy
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
@@ -3984,169 +3853,190 @@ msgstr ""
 "如果为真，您将可以在修改账户窗口中为您的账户可以设置一个否定优先级。注意！当"
 "您使用否定优先级登入时您将从服务器收不到任何消息。"
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:261
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:262
 msgid ""
 "If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
 "account passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:263
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:264
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:265
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:266
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:267
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:268
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:269
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:270
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:271
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:272
 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
+#: ../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!"
 msgstr ""
 
-#: ../src/common/config.py:273
+#: ../src/common/config.py:274
 msgid "If True, completion in groupchats will be like a shell auto-completion"
 msgstr ""
 
-#: ../src/common/config.py:274
+#: ../src/common/config.py:275
 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: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."
+msgstr ""
+
+#: ../src/common/config.py:283
+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"
+msgstr ""
+
+#: ../src/common/config.py:296
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr "优先级将根据您的状态自动改变。优先级在 autopriority_* 选项中定义。"
 
-#: ../src/common/config.py:294
+#: ../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"
 msgstr ""
 
-#: ../src/common/config.py:295
+#: ../src/common/config.py:305
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:297
+#: ../src/common/config.py:307
 msgid ""
 "If True, Contacts requesting authorization will be automatically accepted."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:308
 #, fuzzy
 msgid ""
 "If False, this account will be disabled and will not appear in roster window."
 msgstr "如选否，您将不会在窗口中看到明细。"
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:311
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:303
+#: ../src/common/config.py:313
 msgid "Enable ESessions encryption for this account."
 msgstr ""
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:314
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr ""
 
-#: ../src/common/config.py:305
+#: ../src/common/config.py:315
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:306
+#: ../src/common/config.py:316
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 
-#: ../src/common/config.py:307
+#: ../src/common/config.py:317
 msgid "Show a warning dialog before using standard SSL library."
 msgstr ""
 
-#: ../src/common/config.py:309
+#: ../src/common/config.py:318
+msgid ""
+"Show a warning dialog before sending PLAIN password over a plain conenction."
+msgstr ""
+
+#: ../src/common/config.py:320
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:318
+#: ../src/common/config.py:329
 msgid "Whitespace sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:319
+#: ../src/common/config.py:330
 msgid "XMPP ping sent after inactivity"
 msgstr ""
 
-#: ../src/common/config.py:323
+#: ../src/common/config.py:334
 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:327
+#: ../src/common/config.py:338
 msgid "Jabberd2 workaround"
 msgstr "Jabberd2 工作区"
 
-#: ../src/common/config.py:330
+#: ../src/common/config.py:341
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -4154,230 +4044,227 @@ msgstr ""
 "如果选定， Gajim 将会使把您当前的 IP 和代理服务器设置用于文件传输代理服务器设"
 "置(_P)"
 
-#: ../src/common/config.py:344
+#: ../src/common/config.py:355
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:345
+#: ../src/common/config.py:356
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:353
+#: ../src/common/config.py:366
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:369
+#, fuzzy
+msgid "Message that is sent to contacts you want to add"
+msgstr "请填入您想增加的联系人数据"
+
+#: ../src/common/config.py:431
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "是否为此联系人使用 OpenPGP?"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:432
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
 msgstr ""
 
-#: ../src/common/config.py:418 ../src/common/config.py:421
+#: ../src/common/config.py:433 ../src/common/config.py:436
 msgid "Language for which we want to check misspelled words"
 msgstr "想要检查拼写的语言"
 
-#: ../src/common/config.py:427
+#: ../src/common/config.py:442
 msgid "all or space separated status"
 msgstr "全部或空格分隔的状态"
 
-#: ../src/common/config.py:428
+#: ../src/common/config.py:443
 msgid "'yes', 'no', or 'both'"
 msgstr "'是'，'否'或'两者'"
 
-#: ../src/common/config.py:429 ../src/common/config.py:431
-#: ../src/common/config.py:432 ../src/common/config.py:435
-#: ../src/common/config.py:436
+#: ../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
 msgid "'yes', 'no' or ''"
 msgstr "'是'，'否'或''"
 
-#: ../src/common/config.py:442 ../src/common/pep.py:157
+#: ../src/common/config.py:457 ../src/common/pep.py:157
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:443
+#: ../src/common/config.py:458
 msgid "Back in some minutes."
 msgstr "很快回来"
 
-#: ../src/common/config.py:444 ../src/common/pep.py:127
+#: ../src/common/config.py:459 ../src/common/pep.py:127
 msgid "Eating"
 msgstr "吃饭"
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:459
 msgid "I'm eating, so leave me a message."
 msgstr "正在吃饭，请留言"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:460
 msgid "I'm watching a movie."
 msgstr "正在看电影"
 
-#: ../src/common/config.py:446 ../src/common/pep.py:186
+#: ../src/common/config.py:461 ../src/common/pep.py:186
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:446
+#: ../src/common/config.py:461
 msgid "I'm working."
 msgstr "工作中"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "Phone"
 msgstr "电话"
 
-#: ../src/common/config.py:447
+#: ../src/common/config.py:462
 msgid "I'm on the phone."
 msgstr "我在打电话"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:448
+#: ../src/common/config.py:463
 msgid "I'm out enjoying life."
 msgstr "我正在享受户外生活。"
 
-#: ../src/common/config.py:459
+#: ../src/common/config.py:474
 msgid "I'm available."
 msgstr "我现在在线。"
 
-#: ../src/common/config.py:460
+#: ../src/common/config.py:475
 msgid "I'm free for chat."
 msgstr "自由聊天。"
 
-#: ../src/common/config.py:461 ../src/config.py:1478
+#: ../src/common/config.py:476 ../src/config.py:1576
 msgid "Be right back."
 msgstr "很快回来。"
 
-#: ../src/common/config.py:462
+#: ../src/common/config.py:477
 msgid "I'm not available."
 msgstr "我现在不可用。"
 
-#: ../src/common/config.py:463
+#: ../src/common/config.py:478
 msgid "Do not disturb."
 msgstr "不分发。"
 
-#: ../src/common/config.py:464 ../src/common/config.py:465
+#: ../src/common/config.py:479 ../src/common/config.py:480
 msgid "Bye!"
 msgstr "再见！"
 
-#: ../src/common/config.py:475
+#: ../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."
 msgstr "当收到的群聊消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
 
-#: ../src/common/config.py:476
+#: ../src/common/config.py:491
 msgid "Sound to play when any MUC message arrives."
 msgstr "当 MUC 信息到达时的声音"
 
-#: ../src/common/config.py:485 ../src/common/optparser.py:302
+#: ../src/common/config.py:500 ../src/common/optparser.py:301
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:489 ../src/common/optparser.py:288
+#: ../src/common/config.py:504 ../src/common/optparser.py:287
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:493
+#: ../src/common/config.py:508
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:497
+#: ../src/common/config.py:512
 msgid "marine"
 msgstr "海洋"
 
-#: ../src/common/connection_handlers.py:83
+#: ../src/common/connection_handlers.py:84
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:53
 msgid "Unable to load idle module"
 msgstr "无法加载发呆模块"
 
-#: ../src/common/connection_handlers.py:251
-msgid "Wrong host"
-msgstr "错误主机"
-
-#: ../src/common/connection_handlers.py:252
-msgid "Invalid local address? :-O"
-msgstr ""
-
-#: ../src/common/connection_handlers.py:696
+#: ../src/common/connection_handlers.py:117
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 所需的注册信息未按时抵达"
 
-#: ../src/common/connection_handlers.py:703
+#: ../src/common/connection_handlers.py:124
 #, fuzzy
 msgid "Registration succeeded"
 msgstr " vCard 发布成功"
 
-#: ../src/common/connection_handlers.py:704
+#: ../src/common/connection_handlers.py:125
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, fuzzy
 msgid "Registration failed"
 msgstr "vCard 发布失败"
 
-#: ../src/common/connection_handlers.py:706
+#: ../src/common/connection_handlers.py:133
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1008
-#: ../src/common/connection_handlers.py:2098
-#: ../src/common/connection_handlers.py:2144
-#: ../src/common/connection_handlers.py:2336
-#: ../src/common/connection_handlers.py:2481 ../src/common/connection.py:418
-#: ../src/gajim.py:354
+#: ../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
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1225 ../src/common/connection.py:1373
+#: ../src/common/connection_handlers.py:666 ../src/common/connection.py:1455
 #, fuzzy
 msgid "Invisibility not supported"
 msgstr "不支持扩展"
 
-#: ../src/common/connection_handlers.py:1226 ../src/common/connection.py:1374
+#: ../src/common/connection_handlers.py:667 ../src/common/connection.py:1456
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1919 ../src/common/connection.py:233
-#: ../src/config.py:1940 ../src/config.py:1949 ../src/config.py:2008
-#: ../src/config.py:3360 ../src/dataforms_widget.py:577 ../src/dialogs.py:2781
+#: ../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
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/common/connection_handlers.py:1920
+#: ../src/common/connection_handlers.py:1398
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2101
-#: ../src/common/connection_handlers.py:2147
-#: ../src/common/connection_handlers.py:2339
-#: ../src/common/connection_handlers.py:2484 ../src/common/connection.py:421
-#: ../src/gajim.py:155 ../src/session.py:135
+#: ../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)."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2191
+#: ../src/common/connection_handlers.py:1676
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "昵称不允许： %s "
@@ -4385,77 +4272,77 @@ msgstr "昵称不允许： %s "
 #. maximum user number reached
 #. we are banned
 #. group chat does not exist
-#: ../src/common/connection_handlers.py:2286
-#: ../src/common/connection_handlers.py:2294
-#: ../src/common/connection_handlers.py:2300
-#: ../src/common/connection_handlers.py:2303
-#: ../src/common/connection_handlers.py:2306
-#: ../src/common/connection_handlers.py:2310 ../src/gui_interface.py:128
+#: ../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
 msgid "Unable to join group chat"
 msgstr "无法加入群聊"
 
-#: ../src/common/connection_handlers.py:2287
+#: ../src/common/connection_handlers.py:1772
 #, python-format
 msgid "Maximum number of users for %s has been reached"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2295
+#: ../src/common/connection_handlers.py:1780
 #, fuzzy, python-format
 msgid "You are banned from group chat %s."
 msgstr "您被该群聊封禁。"
 
-#: ../src/common/connection_handlers.py:2301
+#: ../src/common/connection_handlers.py:1786
 #, fuzzy, python-format
 msgid "Group chat %s does not exist."
 msgstr "不存在这样的群聊"
 
-#: ../src/common/connection_handlers.py:2304
+#: ../src/common/connection_handlers.py:1789
 msgid "Group chat creation is restricted."
 msgstr "群聊创建受限。"
 
-#: ../src/common/connection_handlers.py:2307
+#: ../src/common/connection_handlers.py:1792
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "您注册的昵称已被使用"
 
-#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:1796
 #, fuzzy, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "您不在成员名单中。"
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2354
+#: ../src/common/connection_handlers.py:1840
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "授权被移除"
 
-#: ../src/common/connection_handlers.py:2362
+#: ../src/common/connection_handlers.py:1848
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:2393
+#: ../src/common/connection_handlers.py:1884
 msgid "I would like to add you to my roster."
 msgstr "我申请添加您到联系人名单"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2414
+#: ../src/common/connection_handlers.py:1905
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr " %s 请求认证"
 
-#: ../src/common/connection_handlers.py:2416
+#: ../src/common/connection_handlers.py:1907
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr " %s 请求解除认证"
 
-#: ../src/common/connection_handlers.py:2418
+#: ../src/common/connection_handlers.py:1909
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s 解除了认证"
 
-#: ../src/common/connection_handlers.py:2613
+#: ../src/common/connection_handlers.py:2104
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4594,28 +4481,28 @@ msgstr ""
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:234 ../src/dialogs.py:2782
+#: ../src/common/connection.py:249 ../src/dialogs.py:2923
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "无法发送空文件"
 
-#: ../src/common/connection.py:256
+#: ../src/common/connection.py:271
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:259
+#: ../src/common/connection.py:274
 #, 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:307
+#: ../src/common/connection.py:322
 #, fuzzy
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[本条消息已 *加密* (见 :JEP:`27`]"
 
-#: ../src/common/connection.py:408
+#: ../src/common/connection.py:423
 #, fuzzy, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4624,154 +4511,154 @@ msgstr ""
 "主题：%s\n"
 "%s"
 
-#: ../src/common/connection.py:721
+#: ../src/common/connection.py:789
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:722
+#: ../src/common/connection.py:790
 msgid "Reconnect manually."
 msgstr "手动重连。"
 
-#: ../src/common/connection.py:734
+#: ../src/common/connection.py:802
 #, fuzzy, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:768
+#: ../src/common/connection.py:836
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr ""
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:849
 #, fuzzy, python-format
 msgid "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
 #. wrong answer
-#: ../src/common/connection.py:796
+#: ../src/common/connection.py:864
 msgid "Invalid answer"
 msgstr "无效答案"
 
-#: ../src/common/connection.py:797
+#: ../src/common/connection.py:865
 #, fuzzy, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr "服务代理 %s 对注册请求响应错误：%s"
 
-#: ../src/common/connection.py:1075 ../src/common/connection.py:1204
-#: ../src/common/connection.py:1673
+#: ../src/common/connection.py:1146 ../src/common/connection.py:1275
+#: ../src/common/connection.py:1766
 #: ../src/common/zeroconf/connection_zeroconf.py:189
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:1076 ../src/gui_interface.py:705
+#: ../src/common/connection.py:1147 ../src/gui_interface.py:754
 msgid "Check your connection or try again later."
 msgstr "检查连接并稍后重试。"
 
-#: ../src/common/connection.py:1081
+#: ../src/common/connection.py:1152
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "保存在： %s"
 
-#: ../src/common/connection.py:1094
+#: ../src/common/connection.py:1165
 #, fuzzy
 msgid "Connection to proxy failed"
 msgstr "连接失败"
 
-#: ../src/common/connection.py:1125 ../src/common/connection.py:1184
+#: ../src/common/connection.py:1196 ../src/common/connection.py:1255
 #, fuzzy, python-format
 msgid "Could not connect to account %s"
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:1126 ../src/common/connection.py:1185
+#: ../src/common/connection.py:1197 ../src/common/connection.py:1256
 #, fuzzy, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:1151
+#: ../src/common/connection.py:1222
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:1154
+#: ../src/common/connection.py:1225
 #, python-format
 msgid ""
 "\n"
 "SSL Error: <b>%s</b>"
 msgstr ""
 
-#: ../src/common/connection.py:1156
+#: ../src/common/connection.py:1227
 #, fuzzy, python-format
 msgid ""
 "\n"
 "Unknown SSL error: %d"
 msgstr "未知的 D-Bus 版本： %s"
 
-#: ../src/common/connection.py:1205
+#: ../src/common/connection.py:1276
 msgid "Check your connection or try again later"
 msgstr "检查连接并稍后重试"
 
-#: ../src/common/connection.py:1236
+#: ../src/common/connection.py:1307
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "“%s”登录验证失败"
 
-#: ../src/common/connection.py:1238
+#: ../src/common/connection.py:1309
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
-#: ../src/common/connection.py:1300
+#: ../src/common/connection.py:1378
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "添加服务错误。 %s"
 
-#: ../src/common/connection.py:1301
+#: ../src/common/connection.py:1379
 #, 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:1541
+#: ../src/common/connection.py:1632
 #, python-format
 msgid "Sent contact: \"%s\" (%s)"
 msgstr ""
 
-#: ../src/common/connection.py:1544
+#: ../src/common/connection.py:1635
 #, fuzzy
 msgid "Sent contacts:"
 msgstr "联系人"
 
-#: ../src/common/connection.py:1703 ../src/common/connection.py:1724
+#: ../src/common/connection.py:1781 ../src/common/connection.py:1804
 msgid "Not fetched because of invisible status"
 msgstr "由于隐身状态不获取"
 
-#: ../src/common/connection.py:2106
+#: ../src/common/connection.py:2219
 #, fuzzy
 msgid "Unregister failed"
 msgstr "vCard 发布失败"
 
-#: ../src/common/connection.py:2107
+#: ../src/common/connection.py:2220
 #, python-format
 msgid "Unregistration with server %(server)s failed: %(error)s"
 msgstr ""
 
-#: ../src/common/contacts.py:129 ../src/common/helpers.py:55
-#: ../src/gui_interface.py:610
+#: ../src/common/contacts.py:135 ../src/common/helpers.py:57
+#: ../src/gui_interface.py:673
 msgid "Observers"
 msgstr "旁观者"
 
-#: ../src/common/contacts.py:133 ../src/common/contacts.py:335
-#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
-#: ../src/disco.py:1464 ../src/gui_interface.py:413
-#: ../src/roster_window.py:848 ../src/roster_window.py:1501
-#: ../src/roster_window.py:1572 ../src/roster_window.py:1574
-#: ../src/roster_window.py:1732
+#: ../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
 msgid "Transports"
 msgstr "代理"
 
-#: ../src/common/contacts.py:343
+#: ../src/common/contacts.py:374
 #, fuzzy
 msgid "Not in roster"
 msgstr "不在名单中"
@@ -4781,36 +4668,50 @@ msgstr "不在名单中"
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "本机缺少 D-Bus python 绑定"
 
-#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:51
+#: ../src/common/dbus_support.py:41 ../src/common/dbus_support.py:52
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 兼容性无法使用"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:51
 msgid "D-Bus does not run correctly on this machine"
 msgstr ""
 
-#: ../src/common/exceptions.py:30
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) 匹配缺失。正在退出..."
+#: ../src/common/dbus_support.py:54
+#, 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
+#, fuzzy
+msgid "D-Bus does not run correctly on this machine: session bus not present"
+msgstr "D-Bus 在此机器上不可用或 Python 模块缺失"
 
-#: ../src/common/exceptions.py:47
+#: ../src/common/exceptions.py:45
 #, fuzzy
 msgid "Database cannot be read."
 msgstr "账户名不能为空。"
 
-#: ../src/common/exceptions.py:55
+#: ../src/common/exceptions.py:56
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr "服务不可用：Gajim不在运行，或远程控制错误"
 
-#: ../src/common/exceptions.py:63
+#: ../src/common/exceptions.py:67
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus 在此机器上不可用或 Python 模块缺失"
 
-#: ../src/common/exceptions.py:71
+#: ../src/common/exceptions.py:78
+#, fuzzy, python-format
 msgid ""
 "Session bus is not available.\n"
-"Try reading http://trac.gajim.org/wiki/GajimDBus"
+"Try reading %(url)s"
+msgstr "会话总线不可用"
+
+#: ../src/common/exceptions.py:90
+#, fuzzy, python-format
+msgid ""
+"System bus is not available.\n"
+"Try reading %(url)s"
 msgstr ""
 "会话进程不可用。\n"
 "您可以参考 http://trac.gajim.org/wiki/GajimDBus"
@@ -4978,238 +4879,275 @@ msgstr "一周末"
 msgid "Weekend!"
 msgstr "周末"
 
-#: ../src/common/helpers.py:140
+#: ../src/common/helpers.py:151
 msgid "Invalid character in username."
 msgstr "无效的用户名特征。"
 
-#: ../src/common/helpers.py:145
+#: ../src/common/helpers.py:156
 msgid "Server address required."
 msgstr "此处需要服务器地址"
 
-#: ../src/common/helpers.py:151
+#: ../src/common/helpers.py:162
 msgid "Invalid character in hostname."
 msgstr "无效的主机名特征。"
 
-#: ../src/common/helpers.py:158
+#: ../src/common/helpers.py:169
 msgid "Invalid character in resource."
 msgstr "无效的资源特征。"
 
-#: ../src/common/helpers.py:195
+#: ../src/common/helpers.py:209
 msgid "_Busy"
 msgstr "忙碌(_B)"
 
-#: ../src/common/helpers.py:197
+#: ../src/common/helpers.py:211
 msgid "Busy"
 msgstr "忙碌"
 
-#: ../src/common/helpers.py:200
+#: ../src/common/helpers.py:214
 msgid "_Not Available"
 msgstr "不可用(_N)"
 
-#: ../src/common/helpers.py:205
+#: ../src/common/helpers.py:219
 msgid "_Free for Chat"
 msgstr "自由聊天(_F)"
 
-#: ../src/common/helpers.py:207
+#: ../src/common/helpers.py:221
 msgid "Free for Chat"
 msgstr "自由聊天"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:224
 msgid "_Available"
 msgstr "在线(_A)"
 
-#: ../src/common/helpers.py:212 ../src/features_window.py:118
+#: ../src/common/helpers.py:226 ../src/features_window.py:114
 msgid "Available"
 msgstr "在线"
 
-#: ../src/common/helpers.py:214
+#: ../src/common/helpers.py:228
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../src/common/helpers.py:217
+#: ../src/common/helpers.py:231
 msgid "A_way"
 msgstr "离开(_A)"
 
-#: ../src/common/helpers.py:222
+#: ../src/common/helpers.py:236
 msgid "_Offline"
 msgstr "离线(_O)"
 
-#: ../src/common/helpers.py:224
+#: ../src/common/helpers.py:238
 msgid "Offline"
 msgstr "离线"
 
-#: ../src/common/helpers.py:227
+#: ../src/common/helpers.py:241
 msgid "_Invisible"
 msgstr "隐身(_I)"
 
-#: ../src/common/helpers.py:233
+#: ../src/common/helpers.py:247
 msgid "?contact has status:Unknown"
 msgstr "?contact has status: 未知"
 
-#: ../src/common/helpers.py:235
+#: ../src/common/helpers.py:249
 msgid "?contact has status:Has errors"
 msgstr "?contact has status: 有错误"
 
-#: ../src/common/helpers.py:240
+#: ../src/common/helpers.py:254
 msgid "?Subscription we already have:None"
 msgstr "?Subscription we already have: 无"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:256
 msgid "To"
 msgstr "到"
 
-#: ../src/common/helpers.py:246
+#: ../src/common/helpers.py:260
 msgid "Both"
 msgstr "双方"
 
-#: ../src/common/helpers.py:254
+#: ../src/common/helpers.py:268
 msgid "?Ask (for Subscription):None"
 msgstr "?Ask (for Subscription): 无"
 
-#: ../src/common/helpers.py:256
+#: ../src/common/helpers.py:270
 msgid "Subscribe"
 msgstr "认证"
 
-#: ../src/common/helpers.py:265
+#: ../src/common/helpers.py:279
 msgid "?Group Chat Contact Role:None"
 msgstr "?Group Chat Contact Role: 无"
 
-#: ../src/common/helpers.py:268
+#: ../src/common/helpers.py:282
 msgid "Moderators"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:270
+#: ../src/common/helpers.py:284
 msgid "Moderator"
 msgstr "主持人"
 
-#: ../src/common/helpers.py:273
+#: ../src/common/helpers.py:287
 msgid "Participants"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:275
+#: ../src/common/helpers.py:289
 msgid "Participant"
 msgstr "参与者"
 
-#: ../src/common/helpers.py:278
+#: ../src/common/helpers.py:292
 msgid "Visitors"
 msgstr "访客"
 
-#: ../src/common/helpers.py:280
+#: ../src/common/helpers.py:294
 msgid "Visitor"
 msgstr "访客"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:300
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Group Chat Contact Affiliation: 无"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:302
 msgid "Owner"
 msgstr "所有者"
 
-#: ../src/common/helpers.py:290
+#: ../src/common/helpers.py:304
 msgid "Administrator"
 msgstr "管理员"
 
-#: ../src/common/helpers.py:292
+#: ../src/common/helpers.py:306
 msgid "Member"
 msgstr "成员"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:345
 msgid "is paying attention to the conversation"
 msgstr "正在专注于聊天"
 
-#: ../src/common/helpers.py:331
+#: ../src/common/helpers.py:347
 msgid "is doing something else"
 msgstr "在做其他事"
 
-#: ../src/common/helpers.py:333
+#: ../src/common/helpers.py:349
 msgid "is composing a message..."
 msgstr "正在输入消息..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:336
+#: ../src/common/helpers.py:352
 msgid "paused composing a message"
 msgstr "中断输入消息"
 
-#: ../src/common/helpers.py:338
+#: ../src/common/helpers.py:354
 msgid "has closed the chat window or tab"
 msgstr "关闭了聊天窗口或标签"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:588
+#: ../src/common/helpers.py:619
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:591
+#: ../src/common/helpers.py:622
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:595
+#: ../src/common/helpers.py:626
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:598
+#: ../src/common/helpers.py:629
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:602
+#: ../src/common/helpers.py:633
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:605
+#: ../src/common/helpers.py:636
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:608
+#: ../src/common/helpers.py:639
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1049 ../src/common/helpers.py:1056
+#: ../src/common/helpers.py:1108 ../src/common/helpers.py:1115
 #, fuzzy, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "发送消息"
 
-#: ../src/common/helpers.py:1062
+#: ../src/common/helpers.py:1121
 #, fuzzy, python-format
 msgid " from room %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1065 ../src/common/helpers.py:1084
+#: ../src/common/helpers.py:1124 ../src/common/helpers.py:1143
 #, fuzzy, python-format
 msgid " from user %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1067
+#: ../src/common/helpers.py:1126
 #, fuzzy, python-format
 msgid " from %s"
 msgstr "来自 %s"
 
-#: ../src/common/helpers.py:1074 ../src/common/helpers.py:1081
+#: ../src/common/helpers.py:1133 ../src/common/helpers.py:1140
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] ""
 
-#: ../src/common/helpers.py:1114
+#: ../src/common/helpers.py:1173
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/common/latex.py:108
+#: ../src/common/helpers.py:1341
+msgid "Hello, I am $name."
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:106
+#, fuzzy, python-format
+msgid "%s configuration error"
+msgstr "房间设置："
+
+#: ../src/common/jingle_rtp.py:107
+#, python-format
+msgid ""
+"Couldn't setup %s. Check your configuration.\n"
+"\n"
+"Pipeline was:\n"
+"%s\n"
+"\n"
+"Error was:\n"
+"%s"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:299
+msgid "audio input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:302
+msgid "audio output"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:331
+msgid "video input"
+msgstr ""
+
+#: ../src/common/jingle_rtp.py:339
+msgid "video output"
+msgstr ""
+
+#: ../src/common/latex.py:109
 #, python-format
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr ""
@@ -5219,17 +5157,74 @@ msgstr ""
 msgid "%s is not a valid loglevel"
 msgstr ""
 
+#: ../src/common/multimedia_helpers.py:37
+#, fuzzy
+msgid " Default device"
+msgstr "默认状态消息"
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:53
+msgid "Audio test"
+msgstr ""
+
+#. 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
+msgid "Autodetect"
+msgstr ""
+
+#. Alsa src
+#. Alsa sink
+#: ../src/common/multimedia_helpers.py:59
+#: ../src/common/multimedia_helpers.py:71
+#, fuzzy, python-format
+msgid "ALSA: %s"
+msgstr "大小： %s"
+
+#. Fake sink
+#. Fake video output
+#: ../src/common/multimedia_helpers.py:67
+#: ../src/common/multimedia_helpers.py:94
+msgid "Fake audio output"
+msgstr ""
+
+#. Test src
+#: ../src/common/multimedia_helpers.py:79
+msgid "Video test"
+msgstr ""
+
+#. V4L2 src
+#: ../src/common/multimedia_helpers.py:84
+#, python-format
+msgid "V4L2: %s"
+msgstr ""
+
+#. Auto sink
+#: ../src/common/multimedia_helpers.py:96
+#, python-format
+msgid "X Window System (X11/XShm/Xv): %s"
+msgstr ""
+
+#. ximagesink
+#: ../src/common/multimedia_helpers.py:98
+msgid "X Window System (without Xv)"
+msgstr ""
+
 #. we talk about a file
-#: ../src/common/optparser.py:59
+#: ../src/common/optparser.py:53
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:297 ../src/common/optparser.py:298
+#: ../src/common/optparser.py:296 ../src/common/optparser.py:297
 msgid "cyan"
 msgstr "青色"
 
-#: ../src/common/optparser.py:373
+#: ../src/common/optparser.py:376
 #, fuzzy
 msgid "migrating logs database to indices"
 msgstr "合并日志数据库"
@@ -5934,19 +5929,19 @@ msgstr ""
 msgid "Writing"
 msgstr "工作"
 
-#: ../src/common/pep.py:335
+#: ../src/common/pep.py:340
 msgid "Unknown Artist"
 msgstr ""
 
-#: ../src/common/pep.py:338
+#: ../src/common/pep.py:343
 msgid "Unknown Title"
 msgstr ""
 
-#: ../src/common/pep.py:341
+#: ../src/common/pep.py:346
 msgid "Unknown Source"
 msgstr ""
 
-#: ../src/common/pep.py:344
+#: ../src/common/pep.py:349
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -5954,12 +5949,12 @@ msgid ""
 msgstr ""
 
 #. We cannot bind port, call error callback and fail
-#: ../src/common/socks5.py:86
+#: ../src/common/socks5.py:91
 #, python-format
 msgid "Unable to bind to port %s."
 msgstr "无法绑定端口%s。"
 
-#: ../src/common/socks5.py:87
+#: ../src/common/socks5.py:92
 #, fuzzy
 msgid ""
 "Maybe you have another running instance of Gajim. File Transfer will be "
@@ -5967,7 +5962,7 @@ msgid ""
 msgstr "或许您正在运行另一个 Gajim 实例。文件传输将被取消。"
 
 #. we're not english
-#: ../src/common/stanza_session.py:301
+#: ../src/common/stanza_session.py:303
 msgid ""
 "[This is part of an encrypted session. If you see this message, something "
 "went wrong.]"
@@ -6036,26 +6031,22 @@ msgstr "到主机的连接无法建立：发送数据超时。"
 msgid "Error while adding service. %s"
 msgstr "添加服务错误。 %s"
 
-#: ../src/config.py:157 ../src/config.py:586
-msgid "Disabled"
-msgstr "禁用"
-
-#: ../src/config.py:383
+#: ../src/config.py:397
 #, fuzzy
 msgid "Default Message"
 msgstr "默认状态消息"
 
-#: ../src/config.py:392
+#: ../src/config.py:406
 #, fuzzy
 msgid "Enabled"
 msgstr "启用"
 
-#: ../src/config.py:654 ../src/dialogs.py:1365
+#: ../src/config.py:721 ../src/dialogs.py:1394
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "语言 %s 的字典不可用"
 
-#: ../src/config.py:655
+#: ../src/config.py:722
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6063,213 +6054,213 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:1092
+#: ../src/config.py:1190
 msgid "status message text"
 msgstr "状态消息文本"
 
 #. Name column
-#: ../src/config.py:1394 ../src/dialogs.py:2232 ../src/dialogs.py:2298
-#: ../src/dialogs.py:3014 ../src/disco.py:831 ../src/disco.py:1690
-#: ../src/disco.py:1992 ../src/history_window.py:89
+#: ../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
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1487
+#: ../src/config.py:1585
 msgid "Relogin now?"
 msgstr "现在重新登录？"
 
-#: ../src/config.py:1488
+#: ../src/config.py:1586
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "如果想使所有调整立即生效，您必须重新登录。"
 
-#: ../src/config.py:1620 ../src/config.py:1745
+#: ../src/config.py:1722 ../src/config.py:1847
 #, fuzzy
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1785 ../src/config.py:1829
+#: ../src/config.py:1887 ../src/config.py:1934
 msgid "Unread events"
 msgstr "未读取的事件"
 
-#: ../src/config.py:1786
+#: ../src/config.py:1888
 msgid "Read all pending events before removing this account."
 msgstr "移除帐号前请阅读所有未决事件。"
 
-#: ../src/config.py:1812
+#: ../src/config.py:1917
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "您已在账户 %s 打开聊天"
 
-#: ../src/config.py:1813
+#: ../src/config.py:1918
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "所有的聊天和群聊窗口将会关闭。您想继续吗？"
 
-#: ../src/config.py:1825 ../src/config.py:2348 ../src/config.py:2382
+#: ../src/config.py:1930 ../src/config.py:2454 ../src/config.py:2490
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1826
+#: ../src/config.py:1931
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1830
+#: ../src/config.py:1935
 msgid "To change the account name, you must read all pending events."
 msgstr "如要更改账户名称，需先处理所有未决事件"
 
-#: ../src/config.py:1836
+#: ../src/config.py:1941
 msgid "Account Name Already Used"
 msgstr "帐户名已经被占用"
 
-#: ../src/config.py:1837
+#: ../src/config.py:1942
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr "该名称已被您的另一个帐号使用。请选择其他名称"
 
-#: ../src/config.py:1841 ../src/config.py:1845
+#: ../src/config.py:1946 ../src/config.py:1950
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1842
+#: ../src/config.py:1947
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1846
+#: ../src/config.py:1951
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1921
+#: ../src/config.py:2026
 #, fuzzy
 msgid "Rename Account"
 msgstr "帐户管理"
 
-#: ../src/config.py:1922
+#: ../src/config.py:2027
 #, fuzzy, python-format
 msgid "Enter a new name for account %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/config.py:1950
+#: ../src/config.py:2055
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:2158 ../src/config.py:3406
+#: ../src/config.py:2263 ../src/config.py:3548
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:2159 ../src/config.py:3407
+#: ../src/config.py:2264 ../src/config.py:3549
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:2180
+#: ../src/config.py:2285
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:2181
+#: ../src/config.py:2286
 #, fuzzy
 msgid "There is no OpenPGP secret key available."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:2215
+#: ../src/config.py:2320
 msgid "OpenPGP Key Selection"
 msgstr "OpenPGP 密钥选择"
 
-#: ../src/config.py:2216
+#: ../src/config.py:2321
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
-#: ../src/config.py:2223
+#: ../src/config.py:2328
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:2224
+#: ../src/config.py:2329
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:2231 ../src/dialogs.py:2031 ../src/dialogs.py:2220
-#: ../src/dialogs.py:2405 ../src/disco.py:477 ../src/profile_window.py:325
+#: ../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
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:2232
+#: ../src/config.py:2337
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:2236
+#: ../src/config.py:2341
 msgid "Your server doesn't support Vcard"
 msgstr "您的服务器不支持 Vcard"
 
-#: ../src/config.py:2237
+#: ../src/config.py:2342
 msgid "Your server can't save your personal information."
 msgstr "您的服务器无法保存您的个人信息。"
 
-#: ../src/config.py:2349 ../src/config.py:2383
+#: ../src/config.py:2455 ../src/config.py:2491
 #, fuzzy
 msgid "To disable the account, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:2354
+#: ../src/config.py:2460
 msgid "Account Local already exists."
 msgstr "帐户本地已存在。"
 
-#: ../src/config.py:2355
+#: ../src/config.py:2461
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "请在使用本地消息前重命名或移除它。"
 
-#: ../src/config.py:2510
+#: ../src/config.py:2618
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:2512
+#: ../src/config.py:2620
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
 #. list at the beginning
-#: ../src/config.py:2548
+#: ../src/config.py:2656
 msgid "Ban List"
 msgstr "封禁名单"
 
-#: ../src/config.py:2549
+#: ../src/config.py:2657
 msgid "Member List"
 msgstr "成员列表"
 
-#: ../src/config.py:2550
+#: ../src/config.py:2658
 msgid "Owner List"
 msgstr "房主列表"
 
-#: ../src/config.py:2551
+#: ../src/config.py:2659
 msgid "Administrator List"
 msgstr "管理员列表"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2600 ../src/disco.py:838 ../src/history_manager.py:208
+#: ../src/config.py:2708 ../src/disco.py:875 ../src/history_manager.py:201
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2610
+#: ../src/config.py:2718
 msgid "Reason"
 msgstr "原因"
 
-#: ../src/config.py:2617
+#: ../src/config.py:2725
 msgid "Nick"
 msgstr "昵称"
 
-#: ../src/config.py:2623
+#: ../src/config.py:2731
 msgid "Role"
 msgstr "角色"
 
-#: ../src/config.py:2650
+#: ../src/config.py:2758
 msgid "Banning..."
 msgstr "封禁..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2652
+#: ../src/config.py:2760
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6277,11 +6268,11 @@ msgstr ""
 "<b>想做封禁谁？</b>\n"
 "\n"
 
-#: ../src/config.py:2654
+#: ../src/config.py:2762
 msgid "Adding Member..."
 msgstr "正在添加成员..."
 
-#: ../src/config.py:2655
+#: ../src/config.py:2763
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6289,11 +6280,11 @@ msgstr ""
 "<b>想要将谁加为成员？</b>\n"
 "\n"
 
-#: ../src/config.py:2657
+#: ../src/config.py:2765
 msgid "Adding Owner..."
 msgstr "添加房主..."
 
-#: ../src/config.py:2658
+#: ../src/config.py:2766
 #, fuzzy
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
@@ -6302,11 +6293,11 @@ msgstr ""
 "<b>想要将谁加为房主？</b>\n"
 "\n"
 
-#: ../src/config.py:2660
+#: ../src/config.py:2768
 msgid "Adding Administrator..."
 msgstr "添加管理员..."
 
-#: ../src/config.py:2661
+#: ../src/config.py:2769
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6314,7 +6305,7 @@ msgstr ""
 "<b>想要指定谁为管理员？</b>\n"
 "\n"
 
-#: ../src/config.py:2662
+#: ../src/config.py:2770
 #, fuzzy
 msgid ""
 "Can be one of the following:\n"
@@ -6331,90 +6322,118 @@ msgstr ""
 "4. domain (该域本身匹配, 例如任何 user@domain,\n"
 "domain/resource, 或者地址包含一个子域."
 
-#: ../src/config.py:2763
+#: ../src/config.py:2871
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2785 ../src/gui_interface.py:1102
-#: ../src/gui_interface.py:1199
+#: ../src/config.py:2886
+#, fuzzy
+msgid "Account is disabled"
+msgstr "禁用加密"
+
+#: ../src/config.py:2887
+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
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2786 ../src/gui_interface.py:1179
+#: ../src/config.py:2901 ../src/gui_interface.py:1207
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2787 ../src/gui_interface.py:1199
+#: ../src/config.py:2902 ../src/gui_interface.py:1227
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2796
+#: ../src/config.py:2912
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2797
+#: ../src/config.py:2913
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2895
+#: ../src/config.py:2927
+#, fuzzy, python-format
+msgid "Connection to server %s failed"
+msgstr "连接失败"
+
+#: ../src/config.py:2928
+#, fuzzy
+msgid "What would you like to do?"
+msgstr "想做什么？"
+
+#: ../src/config.py:2929
+#, fuzzy
+msgid "Remove only from Gajim"
+msgstr "仅从 Gajim 移除帐户(_O)"
+
+#: ../src/config.py:2930
+msgid "Don't remove anything. I'll try again later"
+msgstr ""
+
+#: ../src/config.py:3023
 msgid "Default"
 msgstr "默认"
 
-#: ../src/config.py:2895
+#: ../src/config.py:3023
 msgid "?print_status:All"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2896
+#: ../src/config.py:3024
 msgid "Enter and leave only"
 msgstr "只是登录和离开"
 
-#: ../src/config.py:2897
+#: ../src/config.py:3025
 #, fuzzy
 msgid "?print_status:None"
 msgstr "?print_status:全部"
 
-#: ../src/config.py:2967
+#: ../src/config.py:3095
 msgid "New Group Chat"
 msgstr "新群聊"
 
-#: ../src/config.py:3000
+#: ../src/config.py:3128
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:3001
+#: ../src/config.py:3129
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
 #. invalid char
-#: ../src/config.py:3119 ../src/dialogs.py:1829
+#: ../src/config.py:3247 ../src/dialogs.py:1925
 #, fuzzy
 msgid "Invalid nickname"
 msgstr "无效用户名"
 
-#: ../src/config.py:3120 ../src/config.py:3134 ../src/config.py:3148
+#: ../src/config.py:3248 ../src/config.py:3262 ../src/config.py:3276
 #, fuzzy
 msgid "Character not allowed"
 msgstr "昵称不允许： %s "
 
-#: ../src/config.py:3133 ../src/config.py:3382
+#: ../src/config.py:3261 ../src/config.py:3524
 #, fuzzy
 msgid "Invalid server"
 msgstr "无效用户名"
 
-#: ../src/config.py:3147
+#: ../src/config.py:3275
 #, fuzzy
 msgid "Invalid room"
 msgstr "无效输入"
 
-#: ../src/config.py:3299
+#: ../src/config.py:3441
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:3300 ../src/config.py:3306
+#: ../src/config.py:3442 ../src/config.py:3448
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6424,34 +6443,34 @@ msgstr ""
 "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单"
 "项。"
 
-#: ../src/config.py:3305
+#: ../src/config.py:3447
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:3343
+#: ../src/config.py:3485
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:3345
+#: ../src/config.py:3487
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:3383
+#: ../src/config.py:3525
 #, fuzzy
 msgid "Please provide a server on which you want to register."
 msgstr "请指定您想使用的新昵称："
 
-#: ../src/config.py:3439 ../src/gui_interface.py:1857
+#: ../src/config.py:3581 ../src/gui_interface.py:1886
 #, fuzzy
 msgid "Certificate Already in File"
 msgstr "联系人已经在名单中"
 
-#: ../src/config.py:3440 ../src/gui_interface.py:1858
+#: ../src/config.py:3582 ../src/gui_interface.py:1887
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3510
+#: ../src/config.py:3655
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6461,7 +6480,7 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/config.py:3516 ../src/gui_interface.py:1882
+#: ../src/config.py:3661 ../src/gui_interface.py:1914
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6469,62 +6488,62 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/config.py:3543 ../src/config.py:3570
+#: ../src/config.py:3691 ../src/config.py:3724
 #, fuzzy
 msgid "An error occurred during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:3637
+#: ../src/config.py:3791
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:3638
+#: ../src/config.py:3792
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../src/config.py:3791
+#: ../src/config.py:3945
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:3799
+#: ../src/config.py:3953
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:3834
+#: ../src/config.py:3988
 msgid "First Message Received"
 msgstr "最初收到的消息"
 
-#: ../src/config.py:3835
+#: ../src/config.py:3989
 #, fuzzy
 msgid "Next Message Received Focused"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:3837
+#: ../src/config.py:3991
 #, fuzzy
 msgid "Next Message Received Unfocused"
 msgstr "收到的下一条消息"
 
-#: ../src/config.py:3838
+#: ../src/config.py:3992
 msgid "Contact Connected"
 msgstr "已连接的联系人"
 
-#: ../src/config.py:3839
+#: ../src/config.py:3993
 msgid "Contact Disconnected"
 msgstr "联系人已断开连接"
 
-#: ../src/config.py:3840
+#: ../src/config.py:3994
 msgid "Message Sent"
 msgstr "消息已发送"
 
-#: ../src/config.py:3841
+#: ../src/config.py:3995
 msgid "Group Chat Message Highlight"
 msgstr "群聊消息突出显示"
 
-#: ../src/config.py:3842
+#: ../src/config.py:3996
 msgid "Group Chat Message Received"
 msgstr "收到的群聊消息"
 
-#: ../src/config.py:3843
+#: ../src/config.py:3997
 msgid "GMail Email Received"
 msgstr "收到 GMail 邮件"
 
@@ -6542,52 +6561,52 @@ msgid ""
 "last time you paid attention to this group chat"
 msgstr "以下文字是您上次发言至今的群聊内容"
 
-#: ../src/conversation_textview.py:737
+#: ../src/conversation_textview.py:738
 #, fuzzy
 msgid "_Quote"
 msgstr "退出(_Q)"
 
-#: ../src/conversation_textview.py:744
+#: ../src/conversation_textview.py:745
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "“%s”的动作(_A)"
 
-#: ../src/conversation_textview.py:756
+#: ../src/conversation_textview.py:757
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:761
+#: ../src/conversation_textview.py:762
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
-#: ../src/conversation_textview.py:778
+#: ../src/conversation_textview.py:779
 #, 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:791
+#: ../src/conversation_textview.py:792
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:794
+#: ../src/conversation_textview.py:795
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:800
+#: ../src/conversation_textview.py:801
 msgid "Open as _Link"
 msgstr "作为链接打开(_L)："
 
 #. %i is day in year (1-365)
-#: ../src/conversation_textview.py:1295
+#: ../src/conversation_textview.py:1292
 #, fuzzy, python-format
 msgid "Yesterday"
 msgid_plural "%i days ago"
 msgstr[0] "昨天"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1330 ../src/history_window.py:475
+#: ../src/conversation_textview.py:1327 ../src/history_window.py:475
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
@@ -6695,74 +6714,74 @@ msgstr "Yahoo! 地址："
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:874
+#: ../src/dialogs.py:875
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:1035 ../src/dialogs.py:1041 ../src/dialogs.py:1046
+#: ../src/dialogs.py:1039 ../src/dialogs.py:1045 ../src/dialogs.py:1050
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:1042
+#: ../src/dialogs.py:1046
 msgid "The user ID must not contain a resource."
 msgstr "该用户 ID 不可包含任何源"
 
-#: ../src/dialogs.py:1047
+#: ../src/dialogs.py:1051
 #, fuzzy
 msgid "You cannot add yourself to your roster."
 msgstr "我申请添加您到联系人名单"
 
-#: ../src/dialogs.py:1061
+#: ../src/dialogs.py:1065
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:1062
+#: ../src/dialogs.py:1066
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1112
 msgid "User ID:"
 msgstr "用户 ID："
 
-#: ../src/dialogs.py:1159
+#: ../src/dialogs.py:1175
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../src/dialogs.py:1160
+#: ../src/dialogs.py:1176
 msgid "GTK+ Version:"
 msgstr "GTK+ 版本："
 
-#: ../src/dialogs.py:1161
+#: ../src/dialogs.py:1177
 msgid "PyGTK Version:"
 msgstr "PyGTK 版本："
 
-#: ../src/dialogs.py:1171
+#: ../src/dialogs.py:1187
 msgid "Current Developers:"
 msgstr "当前的开发者："
 
-#: ../src/dialogs.py:1173
+#: ../src/dialogs.py:1189
 msgid "Past Developers:"
 msgstr "既往开发作者："
 
-#: ../src/dialogs.py:1179
+#: ../src/dialogs.py:1195
 msgid "THANKS:"
 msgstr "感谢："
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1185
+#: ../src/dialogs.py:1201
 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:1198
+#: ../src/dialogs.py:1213
 msgid "translator-credits"
 msgstr ""
 "wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>\n"
 "jeanet <qianxiaojun604@gmail.com>"
 
-#: ../src/dialogs.py:1366
+#: ../src/dialogs.py:1395
 #, fuzzy, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6772,280 +6791,278 @@ msgid ""
 msgstr ""
 "您需安装 %s 字典以使用拼写检查，或者设置拼写检查选项以选择另外一种语言。(_L)"
 
-#: ../src/dialogs.py:1830 ../src/dialogs.py:2171
+#: ../src/dialogs.py:1926 ../src/dialogs.py:2313
 #, fuzzy
 msgid "The nickname has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:1948
+#: ../src/dialogs.py:2044
 #, fuzzy, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:1951
+#: ../src/dialogs.py:2047
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:2026 ../src/gui_interface.py:2592
+#: ../src/dialogs.py:2122 ../src/gui_interface.py:2670
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "您已经在群聊房间 %s 。"
 
-#: ../src/dialogs.py:2032
+#: ../src/dialogs.py:2128
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:2074
+#: ../src/dialogs.py:2169
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:2160
+#: ../src/dialogs.py:2300
 #, fuzzy
 msgid "Invalid Account"
 msgstr "无效的账户名称"
 
-#: ../src/dialogs.py:2161
+#: ../src/dialogs.py:2301
 #, fuzzy
 msgid ""
 "You have to choose an account from which you want to join the groupchat."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/dialogs.py:2170
+#: ../src/dialogs.py:2312
 #, fuzzy
 msgid "Invalid Nickname"
 msgstr "无效用户名"
 
-#: ../src/dialogs.py:2175 ../src/dialogs.py:2181
-#: ../src/groupchat_control.py:1776
+#: ../src/dialogs.py:2317 ../src/dialogs.py:2323
+#: ../src/groupchat_control.py:1758
 msgid "Invalid group chat Jabber ID"
 msgstr "无效的群聊 Jabber ID"
 
-#: ../src/dialogs.py:2176
+#: ../src/dialogs.py:2318
 #, fuzzy
 msgid "Please enter the group chat Jabber ID as room@server."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:2182 ../src/groupchat_control.py:1777
+#: ../src/dialogs.py:2324 ../src/groupchat_control.py:1759
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "群聊 Jabber ID 包含非法字符。"
 
-#: ../src/dialogs.py:2189
+#: ../src/dialogs.py:2331
 msgid "This is not a group chat"
 msgstr "这不是一个群聊"
 
-#: ../src/dialogs.py:2190
+#: ../src/dialogs.py:2332
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s 不是群聊的名称。"
 
-#: ../src/dialogs.py:2221
+#: ../src/dialogs.py:2363
 #, fuzzy
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2235
+#: ../src/dialogs.py:2377
 msgid "Server"
 msgstr "服务器"
 
-#: ../src/dialogs.py:2270
+#: ../src/dialogs.py:2412
 #, fuzzy
 msgid "This account is not connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/dialogs.py:2271
+#: ../src/dialogs.py:2413
 #, fuzzy
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:2295
+#: ../src/dialogs.py:2437
 msgid "Synchronise"
 msgstr ""
 
-#: ../src/dialogs.py:2355
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:2357
+#: ../src/dialogs.py:2500
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:2358
+#: ../src/dialogs.py:2501
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
 msgstr "填写您想发送聊天消息到的联系人 ID 或昵称："
 
 #. if offline or connecting
-#: ../src/dialogs.py:2384 ../src/dialogs.py:2767 ../src/dialogs.py:2929
+#: ../src/dialogs.py:2527 ../src/dialogs.py:2908 ../src/dialogs.py:3122
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:2385 ../src/dialogs.py:2768 ../src/dialogs.py:2930
+#: ../src/dialogs.py:2528 ../src/dialogs.py:2909 ../src/dialogs.py:3123
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:2394 ../src/dialogs.py:2397
+#: ../src/dialogs.py:2537 ../src/dialogs.py:2540
 msgid "Invalid JID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/dialogs.py:2397
+#: ../src/dialogs.py:2540
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "无法解析 \"%s\"。"
 
-#: ../src/dialogs.py:2406
+#: ../src/dialogs.py:2549
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/dialogs.py:2425
+#: ../src/dialogs.py:2568
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
-#: ../src/dialogs.py:2429
+#: ../src/dialogs.py:2572
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/dialogs.py:2430
+#: ../src/dialogs.py:2573
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
-#. img to display
 #. default value
-#: ../src/dialogs.py:2469 ../src/notify.py:263 ../src/notify.py:504
+#: ../src/dialogs.py:2610 ../src/notify.py:265 ../src/notify.py:503
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:2471 ../src/notify.py:271 ../src/notify.py:506
+#: ../src/dialogs.py:2612 ../src/notify.py:273 ../src/notify.py:505
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #. chat message
-#. img to display
-#: ../src/dialogs.py:2473 ../src/notify.py:294 ../src/notify.py:349
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:295 ../src/notify.py:347
+#: ../src/notify.py:507
 msgid "New Message"
 msgstr "新消息"
 
 #. single message
-#: ../src/dialogs.py:2473 ../src/notify.py:275 ../src/notify.py:350
-#: ../src/notify.py:508
+#: ../src/dialogs.py:2614 ../src/notify.py:277 ../src/notify.py:348
+#: ../src/notify.py:507
 msgid "New Single Message"
 msgstr "新消息"
 
 #. private message
-#: ../src/dialogs.py:2474 ../src/notify.py:282 ../src/notify.py:350
-#: ../src/notify.py:509
+#: ../src/dialogs.py:2615 ../src/notify.py:283 ../src/notify.py:348
+#: ../src/notify.py:508
 msgid "New Private Message"
 msgstr "新的个人消息"
 
-#: ../src/dialogs.py:2474 ../src/gui_interface.py:1315 ../src/notify.py:518
+#: ../src/dialogs.py:2615 ../src/gui_interface.py:1343 ../src/notify.py:517
 msgid "New E-mail"
 msgstr "新的电子邮件"
 
-#: ../src/dialogs.py:2476 ../src/gui_interface.py:1382 ../src/notify.py:511
+#: ../src/dialogs.py:2617 ../src/gui_interface.py:1405 ../src/notify.py:510
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
-#: ../src/dialogs.py:2478 ../src/gui_interface.py:1281
-#: ../src/gui_interface.py:1349 ../src/notify.py:513
+#: ../src/dialogs.py:2619 ../src/gui_interface.py:1309
+#: ../src/gui_interface.py:1374 ../src/notify.py:512
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:2480 ../src/gui_interface.py:1427
-#: ../src/gui_interface.py:1449 ../src/gui_interface.py:1466
-#: ../src/notify.py:515
+#: ../src/dialogs.py:2621 ../src/gui_interface.py:1451
+#: ../src/gui_interface.py:1474 ../src/gui_interface.py:1491
+#: ../src/notify.py:514
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:2481 ../src/gui_interface.py:1430 ../src/notify.py:516
+#: ../src/dialogs.py:2622 ../src/gui_interface.py:1454 ../src/notify.py:515
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:2483 ../src/gui_interface.py:1123 ../src/notify.py:520
+#: ../src/dialogs.py:2624 ../src/gui_interface.py:1150 ../src/notify.py:519
 msgid "Groupchat Invitation"
 msgstr "群聊邀请"
 
-#: ../src/dialogs.py:2485 ../src/notify.py:255 ../src/notify.py:522
+#: ../src/dialogs.py:2626 ../src/notify.py:257 ../src/notify.py:521
 msgid "Contact Changed Status"
 msgstr "联系人状态改变"
 
-#: ../src/dialogs.py:2686
+#: ../src/dialogs.py:2827
 #, python-format
 msgid "Single Message using account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2688
+#: ../src/dialogs.py:2829
 #, python-format
 msgid "Single Message in account %s"
 msgstr "账户 %s 的单条消息"
 
-#: ../src/dialogs.py:2690
+#: ../src/dialogs.py:2831
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2693
+#: ../src/dialogs.py:2834
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2716
+#: ../src/dialogs.py:2857
 #, python-format
 msgid "Received %s"
 msgstr "已接收 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2739
+#: ../src/dialogs.py:2880
 #, 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:2818
+#: ../src/dialogs.py:2959
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:2819
+#: ../src/dialogs.py:2960
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:2868
+#: ../src/dialogs.py:3018
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:2870
+#: ../src/dialogs.py:3020
 msgid "XML Console"
 msgstr " XML 控制台"
 
 #. Action that can be done with an incoming list of contacts
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "add"
 msgstr "已冻结"
 
-#: ../src/dialogs.py:2958
+#: ../src/dialogs.py:3151
 #, fuzzy
 msgid "modify"
 msgstr "修改(_M)"
 
-#: ../src/dialogs.py:2959
+#: ../src/dialogs.py:3152
 #, fuzzy
 msgid "remove"
 msgstr "移除(_R)"
 
-#: ../src/dialogs.py:2987
+#: ../src/dialogs.py:3180
 #, fuzzy, python-format
 msgid ""
 "<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts in your "
@@ -7053,156 +7070,156 @@ msgid ""
 msgstr "我想添加您到我的联系人名单"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3003 ../src/dialogs.py:3049
+#: ../src/dialogs.py:3196 ../src/dialogs.py:3242
 msgid "Add"
 msgstr "地址"
 
 #. Change label for accept_button to action name instead of 'OK'.
-#: ../src/dialogs.py:3005 ../src/dialogs.py:3080
+#: ../src/dialogs.py:3198 ../src/dialogs.py:3273
 #, fuzzy
 msgid "Modify"
 msgstr "修改(_M)"
 
-#: ../src/dialogs.py:3011
+#. Change label for accept_button to action name instead of 'OK'.
+#: ../src/dialogs.py:3200 ../src/dialogs.py:3297
+msgid "Delete"
+msgstr "删除"
+
+#: ../src/dialogs.py:3204
 #, fuzzy
 msgid "Jabber ID"
 msgstr "Jabber ID"
 
-#: ../src/dialogs.py:3017
+#: ../src/dialogs.py:3210
 #, fuzzy
 msgid "Groups"
 msgstr "群组"
 
 #. it is selected
 #. remote_jid = model[iter_][1].decode('utf-8')
-#: ../src/dialogs.py:3125
+#: ../src/dialogs.py:3318
 #, fuzzy, python-format
 msgid "%s suggested me to add you in my roster."
 msgstr "我申请添加您到联系人名单"
 
-#: ../src/dialogs.py:3139
+#: ../src/dialogs.py:3332
 #, fuzzy, python-format
 msgid "Added  %s contacts"
 msgstr "添加联系人(_C)"
 
-#: ../src/dialogs.py:3176
+#: ../src/dialogs.py:3369
 #, fuzzy, python-format
 msgid "Removed  %s contacts"
 msgstr "从名单移除联系人"
 
-#: ../src/dialogs.py:3229
+#: ../src/dialogs.py:3422
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "私人列表 <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:3233
+#: ../src/dialogs.py:3426
 #, python-format
 msgid "Privacy List for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:3289
+#: ../src/dialogs.py:3482
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr "顺序：%s，动作：%s，类型：%s，值：%s"
 
-#: ../src/dialogs.py:3294
+#: ../src/dialogs.py:3487
 #, fuzzy, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "顺序： %s，动作：%s"
 
-#: ../src/dialogs.py:3338
+#: ../src/dialogs.py:3531
 msgid "<b>Edit a rule</b>"
 msgstr "<b>编辑规则</b>"
 
-#: ../src/dialogs.py:3449
+#: ../src/dialogs.py:3642
 msgid "<b>Add a rule</b>"
 msgstr "<b>添加规则</b>"
 
-#: ../src/dialogs.py:3549
+#: ../src/dialogs.py:3742
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "%s 的私人列表"
 
-#: ../src/dialogs.py:3551
+#: ../src/dialogs.py:3744
 msgid "Privacy Lists"
 msgstr "私人列表"
 
-#: ../src/dialogs.py:3621
+#: ../src/dialogs.py:3814
 msgid "Invalid List Name"
 msgstr "无效列表名"
 
-#: ../src/dialogs.py:3622
+#: ../src/dialogs.py:3815
 msgid "You must enter a name to create a privacy list."
 msgstr "您必须输入一个名称以创建一个私人列表。"
 
-#: ../src/dialogs.py:3654
+#: ../src/dialogs.py:3847
 #, fuzzy
 msgid "You are invited to a groupchat"
 msgstr "您被该群聊封禁。"
 
-#: ../src/dialogs.py:3657
+#: ../src/dialogs.py:3850
 #, fuzzy
 msgid "$Contact has invited you to join a discussion"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:3659
+#: ../src/dialogs.py:3852
 #, fuzzy, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "%(contact_jid)s 邀请您到 %(room_jid)s 群聊"
 
-#: ../src/dialogs.py:3667
+#: ../src/dialogs.py:3860
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:3669
+#: ../src/dialogs.py:3862
 msgid "Do you want to accept the invitation?"
 msgstr ""
 
-#: ../src/dialogs.py:3730
+#: ../src/dialogs.py:3923
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:3740 ../src/dialogs.py:3796
+#: ../src/dialogs.py:3933 ../src/dialogs.py:3989
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:3745
+#: ../src/dialogs.py:3938
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:3783
+#: ../src/dialogs.py:3976
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/dialogs.py:3801
+#: ../src/dialogs.py:3994
 msgid "Images"
 msgstr "形象"
 
-#: ../src/dialogs.py:3868
+#: ../src/dialogs.py:4061
 #, python-format
 msgid "When %s becomes:"
 msgstr "当 %s 变为："
 
-#: ../src/dialogs.py:3870
+#: ../src/dialogs.py:4063
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "正在为 %s 添加特殊通告"
 
-#. # means number
-#: ../src/dialogs.py:3939
-msgid "#"
-msgstr "#"
-
-#: ../src/dialogs.py:3945
+#: ../src/dialogs.py:4138
 msgid "Condition"
 msgstr "条件"
 
-#: ../src/dialogs.py:4065
+#: ../src/dialogs.py:4258
 msgid "when I am "
 msgstr "当我"
 
-#: ../src/dialogs.py:4541
+#: ../src/dialogs.py:4734
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -7210,38 +7227,38 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4545
+#: ../src/dialogs.py:4737
 msgid "You have already verified this contact's identity."
 msgstr ""
 
-#: ../src/dialogs.py:4551 ../src/dialogs.py:4640
+#: ../src/dialogs.py:4743 ../src/dialogs.py:4827
 msgid "Contact's identity verified"
 msgstr ""
 
-#: ../src/dialogs.py:4559
+#: ../src/dialogs.py:4749
 msgid "Verify again..."
 msgstr ""
 
-#: ../src/dialogs.py:4564
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4567 ../src/dialogs.py:4621 ../src/dialogs.py:4634
+#: ../src/dialogs.py:4757 ../src/dialogs.py:4808 ../src/dialogs.py:4821
 msgid "Contact's identity NOT verified"
 msgstr ""
 
-#: ../src/dialogs.py:4574
+#: ../src/dialogs.py:4762
 msgid "Verify..."
 msgstr ""
 
-#: ../src/dialogs.py:4586
+#: ../src/dialogs.py:4773
 msgid "Have you verified the contact's identity?"
 msgstr ""
 
-#: ../src/dialogs.py:4587
+#: ../src/dialogs.py:4774
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -7251,172 +7268,177 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:4588
+#: ../src/dialogs.py:4775
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:4622
+#: ../src/dialogs.py:4809
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:4628
+#: ../src/dialogs.py:4815
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:4635
+#: ../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."
 msgstr ""
 
-#: ../src/dialogs.py:4641
+#: ../src/dialogs.py:4828
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/dialogs.py:4708
+#: ../src/dialogs.py:4893
 msgid "an audio and video"
 msgstr ""
 
-#: ../src/dialogs.py:4710
+#: ../src/dialogs.py:4895
 msgid "an audio"
 msgstr ""
 
-#: ../src/dialogs.py:4712
+#: ../src/dialogs.py:4897
 msgid "a video"
 msgstr ""
 
-#: ../src/dialogs.py:4716
+#: ../src/dialogs.py:4901
 #, python-format
 msgid ""
 "%(contact)s wants to start %(type)s session with you. Do you want to answer "
 "the call?"
 msgstr ""
 
-#: ../src/disco.py:118
+#: ../src/disco.py:119
 msgid "Others"
 msgstr "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:122
+#: ../src/disco.py:123
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:478
+#: ../src/disco.py:512
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:554
+#: ../src/disco.py:591
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "正在使用帐号 %s 来发掘服务"
 
-#: ../src/disco.py:556
+#: ../src/disco.py:593
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:706
+#: ../src/disco.py:743
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:707
+#: ../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."
 msgstr "此地址没有服务或无应答。请检查地址后重试。"
 
-#: ../src/disco.py:711 ../src/disco.py:1047
+#: ../src/disco.py:748 ../src/disco.py:1084
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:712
+#: ../src/disco.py:749
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:751 ../src/disco.py:761
+#: ../src/disco.py:788 ../src/disco.py:798
 #, fuzzy
 msgid "Invalid Server Name"
 msgstr "无效用户名"
 
-#: ../src/disco.py:815
+#: ../src/disco.py:852
 #, fuzzy, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "浏览 %s 在帐户 %s 上"
 
-#: ../src/disco.py:859
+#: ../src/disco.py:896
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:1048
+#: ../src/disco.py:1085
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1288
+#: ../src/disco.py:1325
 #, fuzzy
 msgid "_Execute Command"
 msgstr "执行命令(_E)..."
 
-#: ../src/disco.py:1298 ../src/disco.py:1469
+#: ../src/disco.py:1335 ../src/disco.py:1506
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1510
+#: ../src/disco.py:1547
 #, fuzzy, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "已扫描 %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1700
+#: ../src/disco.py:1737
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1708
+#: ../src/disco.py:1745
 msgid "Description"
 msgstr "描述"
 
 #. Id column
-#: ../src/disco.py:1716
+#: ../src/disco.py:1753
 msgid "Id"
 msgstr "Id"
 
-#: ../src/disco.py:1781 ../src/gui_interface.py:3088
+#: ../src/disco.py:1783
+#, fuzzy
+msgid "_Bookmark"
+msgstr "将本房间加入书签(_B)"
+
+#: ../src/disco.py:1818 ../src/gui_interface.py:3180
 msgid "Bookmark already set"
 msgstr "书签已设定"
 
-#: ../src/disco.py:1782 ../src/gui_interface.py:3089
+#: ../src/disco.py:1819 ../src/gui_interface.py:3181
 #, python-format
 msgid "Group Chat \"%s\" is already in your bookmarks."
 msgstr "群聊“%s”已在您的书签中。"
 
-#: ../src/disco.py:1791 ../src/gui_interface.py:3102
+#: ../src/disco.py:1828 ../src/gui_interface.py:3195
 msgid "Bookmark has been added successfully"
 msgstr "书签添加成功"
 
-#: ../src/disco.py:1792 ../src/gui_interface.py:3103
+#: ../src/disco.py:1829 ../src/gui_interface.py:3196
 msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "您可以通过“动作”菜单管理您的名单。"
 
-#: ../src/disco.py:2001
+#: ../src/disco.py:2038
 msgid "Subscribed"
 msgstr "订阅"
 
-#: ../src/disco.py:2009
+#: ../src/disco.py:2046
 #, fuzzy
 msgid "Node"
 msgstr "无"
 
-#: ../src/disco.py:2073
+#: ../src/disco.py:2110
 msgid "New post"
 msgstr "新发表"
 
-#: ../src/disco.py:2079
+#: ../src/disco.py:2116
 msgid "_Subscribe"
 msgstr "认证(_S)"
 
-#: ../src/disco.py:2085
+#: ../src/disco.py:2122
 msgid "_Unsubscribe"
 msgstr "退订(_S)"
 
@@ -7465,7 +7487,7 @@ msgstr ""
 #: ../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:111
+#: ../src/features_window.py:87 ../src/features_window.py:107
 msgid "Feature not available under Windows."
 msgstr ""
 
@@ -7631,103 +7653,91 @@ msgstr ""
 msgid "Requires python-docutils."
 msgstr ""
 
-#: ../src/features_window.py:104
-msgid "Banners and clickable links"
-msgstr ""
-
 #: ../src/features_window.py:105
-msgid "Ability to have clickable URLs in chat and groupchat window banners."
-msgstr ""
-
-#: ../src/features_window.py:106 ../src/features_window.py:107
-msgid "Requires python-sexy."
-msgstr ""
-
-#: ../src/features_window.py:108
-msgid "Audio / Video"
-msgstr ""
-
-#: ../src/features_window.py:109
 msgid "Ability to start audio and video chat."
 msgstr ""
 
-#: ../src/features_window.py:110
+#: ../src/features_window.py:106
 msgid "Requires python-farsight."
 msgstr ""
 
-#: ../src/features_window.py:125
+#: ../src/features_window.py:121
 #, fuzzy
 msgid "Feature"
 msgstr "服务器设定"
 
-#: ../src/filetransfers_window.py:76
+#: ../src/filetransfers_window.py:77
 msgid "File"
 msgstr "文件"
 
-#: ../src/filetransfers_window.py:91
+#: ../src/filetransfers_window.py:92
 msgid "Time"
 msgstr "时间"
 
-#: ../src/filetransfers_window.py:103
+#: ../src/filetransfers_window.py:104
 msgid "Progress"
 msgstr "进程"
 
-#: ../src/filetransfers_window.py:177 ../src/filetransfers_window.py:233
+#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:234
 #, python-format
 msgid "Filename: %s"
 msgstr "文件名： %s"
 
-#: ../src/filetransfers_window.py:178 ../src/filetransfers_window.py:323
+#: ../src/filetransfers_window.py:179 ../src/filetransfers_window.py:323
 #, python-format
 msgid "Size: %s"
 msgstr "大小： %s"
 
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:197
-#: ../src/history_manager.py:529
+#: ../src/filetransfers_window.py:188 ../src/filetransfers_window.py:198
+#: ../src/history_manager.py:522
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:188
+#: ../src/filetransfers_window.py:189
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者： %s"
 
-#: ../src/filetransfers_window.py:189 ../src/filetransfers_window.py:617
-#: ../src/tooltips.py:651
+#: ../src/filetransfers_window.py:190 ../src/filetransfers_window.py:617
+#: ../src/tooltips.py:700
 msgid "Recipient: "
 msgstr "接收者： %s"
 
-#: ../src/filetransfers_window.py:200
+#: ../src/filetransfers_window.py:201
 #, python-format
 msgid "Saved in: %s"
 msgstr "保存在： %s"
 
-#: ../src/filetransfers_window.py:202
+#: ../src/filetransfers_window.py:203
 msgid "File transfer completed"
 msgstr "文件传输已完成"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:224
+#: ../src/filetransfers_window.py:205
+msgid "_Open Containing Folder"
+msgstr "打开文件夹(_O)"
+
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:225
 #, fuzzy
 msgid "File transfer cancelled"
 msgstr "文件传输已取消"
 
-#: ../src/filetransfers_window.py:217 ../src/filetransfers_window.py:225
+#: ../src/filetransfers_window.py:218 ../src/filetransfers_window.py:226
 msgid "Connection with peer cannot be established."
 msgstr "无法与对方建立连接。"
 
-#: ../src/filetransfers_window.py:234
+#: ../src/filetransfers_window.py:235
 #, python-format
 msgid "Recipient: %s"
 msgstr "接收者： %s"
 
-#: ../src/filetransfers_window.py:236
+#: ../src/filetransfers_window.py:237
 #, python-format
 msgid "Error message: %s"
 msgstr "错误消息：%s"
 
-#: ../src/filetransfers_window.py:237
+#: ../src/filetransfers_window.py:238
 #, fuzzy
 msgid "File transfer stopped"
 msgstr "文件传输已停止"
@@ -7736,7 +7746,7 @@ msgstr "文件传输已停止"
 msgid "Choose File to Send..."
 msgstr "选择要发送的文件..."
 
-#: ../src/filetransfers_window.py:273 ../src/tooltips.py:689
+#: ../src/filetransfers_window.py:273 ../src/tooltips.py:738
 #, fuzzy
 msgid "Description: "
 msgstr "描述： %s"
@@ -7769,33 +7779,33 @@ msgstr "描述： %s"
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:858
+#: ../src/filetransfers_window.py:342 ../src/gtkgui_helpers.py:902
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "无法覆盖现有文件\"%s\""
 
-#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:860
+#: ../src/filetransfers_window.py:343 ../src/gtkgui_helpers.py:903
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
 msgstr "文件名已经存在且您没有权限覆盖它。"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 msgid "This file already exists"
 msgstr "文件已经存在"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:864
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:907
 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:871
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:914
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "目录 \"%s\" 不可写"
 
-#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:872
+#: ../src/filetransfers_window.py:369 ../src/gtkgui_helpers.py:915
 msgid "You do not have permission to create files in this directory."
 msgstr "您没有权限在这个目录里创建文件。"
 
@@ -7831,73 +7841,57 @@ msgstr "文件："
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:613 ../src/tooltips.py:641
+#: ../src/filetransfers_window.py:613 ../src/tooltips.py:690
 msgid "Name: "
 msgstr "名称："
 
-#: ../src/filetransfers_window.py:615 ../src/tooltips.py:645
+#: ../src/filetransfers_window.py:615 ../src/tooltips.py:694
 msgid "Sender: "
 msgstr "发送者："
 
-#: ../src/filetransfers_window.py:809
+#: ../src/filetransfers_window.py:777
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/gajim.py:139
+#: ../src/filetransfers_window.py:788
+msgid "_Continue"
+msgstr "继续(_C)"
+
+#: ../src/gajim.py:141
 #, fuzzy
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "运行 Gajim 需要 X 服务器。退出..."
 
-#: ../src/gajim.py:141
+#: ../src/gajim.py:143
 #, python-format
 msgid "importing PyGTK failed: %s"
 msgstr ""
 
-#: ../src/gajim.py:180
+#: ../src/gajim.py:183
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above"
+msgid "Gajim needs PyGTK 2.16 or above"
 msgstr "Gajim 需要 PyGTK 2.6 或更高版本"
 
-#: ../src/gajim.py:181
+#: ../src/gajim.py:184
 #, fuzzy
-msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs PyGTK 2.16 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 PyGTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:183
+#: ../src/gajim.py:186
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above"
+msgid "Gajim needs GTK 2.16 or above"
 msgstr "Gajim 需要 GTK 2.6 或更高版本"
 
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy
-msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
+msgid "Gajim needs GTK 2.16 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 GTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:189
-msgid "GTK+ runtime is missing libglade support"
-msgstr "GTK+ 运行时环境缺少 libglade 支持"
-
-#: ../src/gajim.py:191
-#, python-format
-msgid ""
-"Please remove your current GTK+ runtime and install the latest stable "
-"version from %s"
-msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
-
-#: ../src/gajim.py:193
-msgid ""
-"Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "请确认您系统中 gtk+ 及 pygtk 对 libglade 的支持。"
-
-#: ../src/gajim.py:198
-msgid "Gajim needs PySQLite2 to run"
-msgstr "运行 Gajim 需要 PySQLite2 "
-
-#: ../src/gajim.py:206
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "运行 Gajim 需要 pywin32"
 
-#: ../src/gajim.py:207
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7905,11 +7899,11 @@ msgid ""
 msgstr "请确认 Pywin32 已经安装在您的系统中。您可以从 %s取得它"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:328
+#: ../src/gajim.py:320
 msgid "Gajim is already running"
 msgstr "Gajim 已经在运行"
 
-#: ../src/gajim.py:329
+#: ../src/gajim.py:321
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7952,8 +7946,8 @@ msgstr "打印名单中所有联系人。每个联系人一行。"
 #: ../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:271
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:255 ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:291
 msgid "account"
 msgstr "账户"
 
@@ -7975,12 +7969,15 @@ msgid "status"
 msgstr "状态"
 
 #: ../src/gajim-remote.py:109
-msgid "one of: offline, online, chat, away, xa, dnd, invisible "
+#, fuzzy
+msgid ""
+"one of: offline, online, chat, away, xa, dnd, invisible. If not set, use "
+"accoun't previous status"
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
 #: ../src/gajim-remote.py:110 ../src/gajim-remote.py:133
 #: ../src/gajim-remote.py:144 ../src/gajim-remote.py:158
-#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:169 ../src/gajim-remote.py:282
 msgid "message"
 msgstr "消息"
 
@@ -8207,80 +8204,97 @@ msgid ""
 msgstr "XML 将被发送的账户；如果不指定，XML 将被发送至所有账户"
 
 #: ../src/gajim-remote.py:268
+#, fuzzy
+msgid "Change the avatar"
+msgstr "联系人状态改变"
+
+#: ../src/gajim-remote.py:270
+#, fuzzy
+msgid "Picture to use"
+msgstr "昵称未找到： %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:277
 msgid "Handle a xmpp:/ uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "uri"
 msgstr ""
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:279
 msgid "URI to handle"
 msgstr ""
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:280
 msgid "Account in which you want to handle it"
 msgstr ""
 
-#: ../src/gajim-remote.py:273
+#: ../src/gajim-remote.py:282
 #, fuzzy
 msgid "Message content"
 msgstr "消息内容"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:286
 #, fuzzy
 msgid "Join a MUC room"
 msgstr "加入新房间(_J)"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "room"
 msgstr "来自"
 
-#: ../src/gajim-remote.py:279
+#: ../src/gajim-remote.py:288
 #, fuzzy
 msgid "Room JID"
 msgstr "房间："
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "nick"
 msgstr "昵称"
 
-#: ../src/gajim-remote.py:280
+#: ../src/gajim-remote.py:289
 #, fuzzy
 msgid "Nickname to use"
 msgstr "昵称未找到： %s "
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "password"
 msgstr "密码："
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:290
 #, fuzzy
 msgid "Password to enter the room"
 msgstr "密码不符"
 
-#: ../src/gajim-remote.py:282
+#: ../src/gajim-remote.py:291
 msgid "Account from which you want to enter the room"
 msgstr ""
 
-#: ../src/gajim-remote.py:287
+#: ../src/gajim-remote.py:296
 #, fuzzy
 msgid "Check if Gajim is running"
 msgstr "请检查 avahi-daemon 是否运行。"
 
-#: ../src/gajim-remote.py:291
+#: ../src/gajim-remote.py:300
 #, fuzzy
 msgid "Shows or hides the ipython window"
 msgstr "显示/隐藏名单窗口"
 
-#: ../src/gajim-remote.py:318
+#: ../src/gajim-remote.py:327
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的“联系人 JID”参数"
 
-#: ../src/gajim-remote.py:339
+#: ../src/gajim-remote.py:348
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8289,31 +8303,31 @@ msgstr ""
 "\"%s\" 不在您的名单中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote.py:342
+#: ../src/gajim-remote.py:351
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote.py:395
+#: ../src/gajim-remote.py:404
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 
-#: ../src/gajim-remote.py:422
+#: ../src/gajim-remote.py:431
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 msgstr ""
 
-#: ../src/gajim-remote.py:426
+#: ../src/gajim-remote.py:435
 msgid "Arguments:"
 msgstr "参数："
 
-#: ../src/gajim-remote.py:430
+#: ../src/gajim-remote.py:439
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote.py:436
+#: ../src/gajim-remote.py:445
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8322,7 +8336,7 @@ msgstr ""
 "用法：%s 命令 [参数] \n"
 "命令是下列之一：\n"
 
-#: ../src/gajim-remote.py:505
+#: ../src/gajim-remote.py:514
 #, fuzzy, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8331,7 +8345,7 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:510
+#: ../src/gajim-remote.py:519
 #, fuzzy, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8340,7 +8354,11 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim-remote.py:529
+#: ../src/gajim-remote.py:538
+msgid "No uri given"
+msgstr ""
+
+#: ../src/gajim-remote.py:540
 #, fuzzy
 msgid "Wrong uri"
 msgstr "错误主机"
@@ -8371,198 +8389,199 @@ msgstr "无法删除当前主题"
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#: ../src/groupchat_control.py:167
+#: ../src/groupchat_control.py:164
 msgid "Sending private message failed"
 msgstr "发送私有消息失败"
 
 #. in second %s code replaces with nickname
-#: ../src/groupchat_control.py:169
+#: ../src/groupchat_control.py:166
 #, 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:439
+#: ../src/groupchat_control.py:436
 msgid "Insert Nickname"
 msgstr "插入昵称"
 
-#: ../src/groupchat_control.py:617
+#: ../src/groupchat_control.py:614
 #, fuzzy
 msgid "Conversation with "
 msgstr "对话历史"
 
-#: ../src/groupchat_control.py:619
+#: ../src/groupchat_control.py:616
 #, fuzzy
 msgid "Continued conversation"
 msgstr "连接"
 
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/groupchat_control.py:1228 ../src/gui_interface.py:1050
+#: ../src/groupchat_control.py:1213 ../src/gui_interface.py:1078
 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:1231
+#: ../src/groupchat_control.py:1216
 msgid "Room logging is enabled"
 msgstr ""
 
-#: ../src/groupchat_control.py:1233
+#: ../src/groupchat_control.py:1218
 #, fuzzy
 msgid "A new room has been created"
 msgstr "注册新账户成功"
 
-#: ../src/groupchat_control.py:1236
+#: ../src/groupchat_control.py:1221
 msgid "The server has assigned or modified your roomnick"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1242
+#: ../src/groupchat_control.py:1227
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1246
+#: ../src/groupchat_control.py:1231
 #, 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:1256
+#: ../src/groupchat_control.py:1241
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1260
+#: ../src/groupchat_control.py:1245
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_control.py:1272 ../src/groupchat_control.py:1365
+#: ../src/groupchat_control.py:1257 ../src/groupchat_control.py:1352
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_control.py:1288 ../src/gui_interface.py:894
+#: ../src/groupchat_control.py:1273 ../src/gui_interface.py:918
 #, fuzzy, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%s 现在成了 %s"
 
-#: ../src/groupchat_control.py:1326 ../src/groupchat_control.py:1330
-#: ../src/groupchat_control.py:1335
+#: ../src/groupchat_control.py:1311 ../src/groupchat_control.py:1315
+#: ../src/groupchat_control.py:1320
 #, 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:1327
+#: ../src/groupchat_control.py:1312
 #, fuzzy
 msgid "affiliation changed"
 msgstr "会籍："
 
-#: ../src/groupchat_control.py:1332
+#: ../src/groupchat_control.py:1317
 msgid "room configuration changed to members-only"
 msgstr ""
 
-#: ../src/groupchat_control.py:1337
+#: ../src/groupchat_control.py:1322
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1414
+#: ../src/groupchat_control.py:1401
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1418
+#: ../src/groupchat_control.py:1405
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1433
+#: ../src/groupchat_control.py:1420
 #, 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:1437
+#: ../src/groupchat_control.py:1424
 #, fuzzy, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_control.py:1466
+#: ../src/groupchat_control.py:1453
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_control.py:1471
+#: ../src/groupchat_control.py:1458
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s 加入群聊"
 
-#: ../src/groupchat_control.py:1473 ../src/gui_interface.py:919
-#: ../src/history_window.py:442 ../src/notify.py:250
+#: ../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 的状态是 %(status)s"
 
-#: ../src/groupchat_control.py:1706
+#: ../src/groupchat_control.py:1688
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "确定要离开群聊“ %s ”？"
 
-#: ../src/groupchat_control.py:1708
+#: ../src/groupchat_control.py:1690
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr "如果关闭此窗口，您将断开此群聊的连接。"
 
-#: ../src/groupchat_control.py:1712 ../src/gui_interface.py:1172
-#: ../src/gui_interface.py:1940 ../src/gui_interface.py:1975
-#: ../src/message_window.py:227 ../src/roster_window.py:2658
-#: ../src/roster_window.py:3301 ../src/roster_window.py:3990
+#: ../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 "不再提问此问题(_N)"
 
-#: ../src/groupchat_control.py:1745
+#: ../src/groupchat_control.py:1727
 msgid "Changing Subject"
 msgstr "正在更换话题"
 
-#: ../src/groupchat_control.py:1746
+#: ../src/groupchat_control.py:1728
 msgid "Please specify the new subject:"
 msgstr "请指定新话题："
 
-#: ../src/groupchat_control.py:1753
+#: ../src/groupchat_control.py:1735
 msgid "Changing Nickname"
 msgstr "正在更换昵称"
 
-#: ../src/groupchat_control.py:1754
+#: ../src/groupchat_control.py:1736
 msgid "Please specify the new nickname you want to use:"
 msgstr "请指定您想使用的新昵称："
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1783
+#: ../src/groupchat_control.py:1765
 #, fuzzy, python-format
 msgid "Destroying %s"
 msgstr "描述： %s"
 
-#: ../src/groupchat_control.py:1784
+#: ../src/groupchat_control.py:1766
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1786
+#: ../src/groupchat_control.py:1768
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:1967
+#: ../src/groupchat_control.py:1952
 #, python-format
 msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_control.py:1968 ../src/groupchat_control.py:2291
+#: ../src/groupchat_control.py:1953 ../src/groupchat_control.py:2276
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_control.py:2290
+#: ../src/groupchat_control.py:2275
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
@@ -8581,59 +8600,59 @@ msgstr "它可能不是致命的，但仍应该提交给开发者。"
 msgid "_Report Bug"
 msgstr "报告错误(_R)"
 
-#: ../src/gtkexcepthook.py:77
+#: ../src/gtkexcepthook.py:76
 msgid "Details"
 msgstr "细节"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:171 ../src/gtkgui_helpers.py:186
+#: ../src/gtkgui_helpers.py:205 ../src/gtkgui_helpers.py:221
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/gtkgui_helpers.py:362
+#: ../src/gtkgui_helpers.py:400
 msgid "Error reading file:"
 msgstr "读文件错误："
 
-#: ../src/gtkgui_helpers.py:365
+#: ../src/gtkgui_helpers.py:403
 msgid "Error parsing file:"
 msgstr "分析文件错误："
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:406
+#: ../src/gtkgui_helpers.py:444
 #, 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:770
+#: ../src/gtkgui_helpers.py:818
 msgid "Gajim is not the default Jabber client"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:771
+#: ../src/gtkgui_helpers.py:819
 #, fuzzy
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "确认覆盖该文件？"
 
-#: ../src/gtkgui_helpers.py:772
+#: ../src/gtkgui_helpers.py:820
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:845
+#: ../src/gtkgui_helpers.py:887
 msgid "Extension not supported"
 msgstr "不支持扩展"
 
-#: ../src/gtkgui_helpers.py:846
+#: ../src/gtkgui_helpers.py:888
 #, 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:881
+#: ../src/gtkgui_helpers.py:924
 msgid "Save Image as..."
 msgstr "图片另存为..."
 
-#: ../src/gui_interface.py:129
+#: ../src/gui_interface.py:139
 #, fuzzy, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -8643,164 +8662,164 @@ msgstr ""
 "您申请的昵称正在使用或被其他人占有。\n"
 "从下列昵称中另外指定一个："
 
-#: ../src/gui_interface.py:132
+#: ../src/gui_interface.py:142
 msgid "Always use this nickname when there is a conflict"
 msgstr ""
 
-#: ../src/gui_interface.py:149
+#: ../src/gui_interface.py:158
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gui_interface.py:151
+#: ../src/gui_interface.py:160
 #, fuzzy, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gui_interface.py:154
+#: ../src/gui_interface.py:163
 #, fuzzy, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%s) 授权给 %s (id: %s)"
 
-#: ../src/gui_interface.py:205 ../src/notify.py:524
+#: ../src/gui_interface.py:212 ../src/notify.py:523
 msgid "Connection Failed"
 msgstr "连接失败"
 
-#: ../src/gui_interface.py:544 ../src/gui_interface.py:548
+#: ../src/gui_interface.py:605 ../src/gui_interface.py:609
 #, 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:558 ../src/gui_interface.py:572
+#: ../src/gui_interface.py:620 ../src/gui_interface.py:635
 #, fuzzy, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "发送 %s ( %s ) 时出现错误"
 
-#: ../src/gui_interface.py:599 ../src/notify.py:526
+#: ../src/gui_interface.py:662 ../src/notify.py:525
 #, fuzzy
 msgid "Subscription request"
 msgstr "认证请求"
 
-#: ../src/gui_interface.py:624
+#: ../src/gui_interface.py:687
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gui_interface.py:625
+#: ../src/gui_interface.py:688
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人“%s”已授权您查看他/她的状态。"
 
-#: ../src/gui_interface.py:637
+#: ../src/gui_interface.py:701
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人“%s”移除了来自您的认证"
 
-#: ../src/gui_interface.py:638
+#: ../src/gui_interface.py:702
 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:663 ../src/notify.py:528
+#: ../src/gui_interface.py:726 ../src/notify.py:527
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "退订(_S)"
 
-#: ../src/gui_interface.py:704
+#: ../src/gui_interface.py:753
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与对方“ %s ”建立连接。"
 
-#: ../src/gui_interface.py:986
+#: ../src/gui_interface.py:1013
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1053
+#: ../src/gui_interface.py:1081
 msgid "Room now shows unavailable member"
 msgstr ""
 
-#: ../src/gui_interface.py:1055
+#: ../src/gui_interface.py:1083
 msgid "room now does not show unavailable members"
 msgstr ""
 
-#: ../src/gui_interface.py:1058
+#: ../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:1061
+#: ../src/gui_interface.py:1089
 msgid "Room logging is now enabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1063
+#: ../src/gui_interface.py:1091
 msgid "Room logging is now disabled"
 msgstr ""
 
-#: ../src/gui_interface.py:1065
+#: ../src/gui_interface.py:1093
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1068
+#: ../src/gui_interface.py:1096
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1071
+#: ../src/gui_interface.py:1099
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gui_interface.py:1103
+#: ../src/gui_interface.py:1131
 #, fuzzy, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "该群聊要求密码才能加入。"
 
-#: ../src/gui_interface.py:1137
+#: ../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"
 msgstr ""
 
-#: ../src/gui_interface.py:1139 ../src/gui_interface.py:1145
+#: ../src/gui_interface.py:1166 ../src/gui_interface.py:1173
 msgid "You are currently connected without your OpenPGP key."
 msgstr "已建立没有 OpenPGP 密钥的连接"
 
-#: ../src/gui_interface.py:1140
+#: ../src/gui_interface.py:1168
 msgid "Your passphrase is incorrect"
 msgstr "您的密文不正确"
 
-#: ../src/gui_interface.py:1144
+#: ../src/gui_interface.py:1172
 #, fuzzy
 msgid "OpenGPG Passphrase Incorrect"
 msgstr "您的密文不正确"
 
-#: ../src/gui_interface.py:1170
+#: ../src/gui_interface.py:1198
 msgid "GPG key not trusted"
 msgstr ""
 
-#: ../src/gui_interface.py:1170
+#: ../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?"
 msgstr ""
 
-#: ../src/gui_interface.py:1182
+#: ../src/gui_interface.py:1210
 msgid ""
-"Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
-"variable probably not \t\t\t\tcorrectly set)"
+"Gnome Keyring is installed but not                 correctly started "
+"(environment variable probably not                 correctly set)"
 msgstr ""
 
-#: ../src/gui_interface.py:1292
+#: ../src/gui_interface.py:1319
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr " %(gmail_mail_address)s 上的新邮件"
 
-#: ../src/gui_interface.py:1294
+#: ../src/gui_interface.py:1321
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "您有 %d 条新邮件会话"
 
-#: ../src/gui_interface.py:1307
+#: ../src/gui_interface.py:1334
 #, python-format
 msgid ""
 "\n"
@@ -8810,102 +8829,103 @@ msgid ""
 "%(snippet)s"
 msgstr ""
 
-#: ../src/gui_interface.py:1379
+#: ../src/gui_interface.py:1403
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gui_interface.py:1417 ../src/roster_window.py:1814
+#: ../src/gui_interface.py:1440 ../src/roster_window.py:1853
 #, fuzzy
 msgid "Remote contact stopped transfer"
 msgstr "从名单移除联系人"
 
-#: ../src/gui_interface.py:1419 ../src/roster_window.py:1816
+#: ../src/gui_interface.py:1443 ../src/roster_window.py:1855
 #, fuzzy
 msgid "Error opening file"
 msgstr "读文件错误："
 
-#: ../src/gui_interface.py:1450
+#: ../src/gui_interface.py:1475
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "您成功的从 %(name)s 收到文件  %(filename)s。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1454
+#: ../src/gui_interface.py:1479
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1467
+#: ../src/gui_interface.py:1492
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
 #. ft stopped
-#: ../src/gui_interface.py:1471
+#: ../src/gui_interface.py:1496
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/gui_interface.py:1576
+#: ../src/gui_interface.py:1608
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gui_interface.py:1583
+#: ../src/gui_interface.py:1615
 #, fuzzy
 msgid "Unable to decrypt message"
 msgstr "对于每条消息(_M)"
 
-#: ../src/gui_interface.py:1657
+#: ../src/gui_interface.py:1686
 msgid "Username Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gui_interface.py:1658
+#: ../src/gui_interface.py:1687
 msgid "Please type a new username for your local account"
 msgstr "<b>请在您本地账户填写新的用户名</b>"
 
-#: ../src/gui_interface.py:1670
+#: ../src/gui_interface.py:1700
 msgid "Ping?"
 msgstr ""
 
-#: ../src/gui_interface.py:1683
+#: ../src/gui_interface.py:1713
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr ""
 
-#: ../src/gui_interface.py:1694
+#: ../src/gui_interface.py:1724
 msgid "Error."
 msgstr ""
 
-#: ../src/gui_interface.py:1721
+#: ../src/gui_interface.py:1752
 #, fuzzy
 msgid "Resource Conflict"
 msgstr "用户名冲突"
 
-#: ../src/gui_interface.py:1722
+#: ../src/gui_interface.py:1753
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr ""
 
-#: ../src/gui_interface.py:1771
+#. TODO: we should use another pixmap ;-)
+#: ../src/gui_interface.py:1800
 #, fuzzy, python-format
 msgid "%s wants to start a voice chat."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/gui_interface.py:1774
+#: ../src/gui_interface.py:1803
 #, fuzzy
 msgid "Voice Chat Request"
 msgstr "文件传输请求"
 
-#: ../src/gui_interface.py:1879
+#: ../src/gui_interface.py:1909
 msgid "Error verifying SSL certificate"
 msgstr ""
 
-#: ../src/gui_interface.py:1880
+#: ../src/gui_interface.py:1910
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -8913,15 +8933,15 @@ msgid ""
 "Do you still want to connect to this server?"
 msgstr ""
 
-#: ../src/gui_interface.py:1885
+#: ../src/gui_interface.py:1918
 msgid "Ignore this error for this certificate."
 msgstr ""
 
-#: ../src/gui_interface.py:1905
+#: ../src/gui_interface.py:1938
 msgid "SSL certificate error"
 msgstr ""
 
-#: ../src/gui_interface.py:1906
+#: ../src/gui_interface.py:1939
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -8932,90 +8952,100 @@ msgid ""
 "Do you still want to connect and update the fingerprint of the certificate?"
 msgstr ""
 
-#: ../src/gui_interface.py:1936 ../src/gui_interface.py:1971
+#: ../src/gui_interface.py:1969 ../src/gui_interface.py:2006
+#: ../src/gui_interface.py:2042
 #, fuzzy
 msgid "Insecure connection"
 msgstr "连接"
 
-#: ../src/gui_interface.py:1937
+#: ../src/gui_interface.py:1970
 #, fuzzy
 msgid ""
-"You are about to send your password on an unencrypted connection. Are you "
-"sure you want to do that?"
+"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:1939 ../src/gui_interface.py:1974
+#: ../src/gui_interface.py:1973 ../src/gui_interface.py:2010
+#: ../src/gui_interface.py:2045
 msgid "Yes, I really want to connect insecurely"
 msgstr ""
 
-#: ../src/gui_interface.py:1972
+#: ../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:1992
+#: ../src/gui_interface.py:2043
+#, fuzzy
+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"
 msgstr ""
 
-#: ../src/gui_interface.py:1993
+#: ../src/gui_interface.py:2065
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gui_interface.py:2547 ../src/gui_interface.py:2569
+#: ../src/gui_interface.py:2622 ../src/gui_interface.py:2645
 #, fuzzy
 msgid "Emoticons disabled"
 msgstr "禁用加密"
 
-#: ../src/gui_interface.py:2548
+#: ../src/gui_interface.py:2623
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gui_interface.py:2570
+#: ../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."
 msgstr ""
 
-#: ../src/gui_interface.py:2598 ../src/roster_window.py:3441
+#: ../src/gui_interface.py:2677 ../src/roster_window.py:3557
 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:2969
+#: ../src/gui_interface.py:3056
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gui_interface.py:3462
+#: ../src/gui_interface.py:3592
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/gui_interface.py:3463
+#: ../src/gui_interface.py:3593
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr "为账户 %s 输入 GPG 密文字段"
 
-#: ../src/gui_interface.py:3477
+#: ../src/gui_interface.py:3607
 msgid "GPG key expired"
 msgstr ""
 
-#: ../src/gui_interface.py:3478
+#: ../src/gui_interface.py:3608
 #, fuzzy, python-format
 msgid "Your GPG key has expired, you will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
 #. ask again
-#: ../src/gui_interface.py:3487
+#: ../src/gui_interface.py:3617
 msgid "Wrong Passphrase"
 msgstr "错误字段"
 
-#: ../src/gui_interface.py:3488
+#: ../src/gui_interface.py:3618
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "请重新输入您的 GPG 字段或点“取消”"
 
@@ -9024,43 +9054,43 @@ msgstr "请重新输入您的 GPG 字段或点“取消”"
 msgid "_New Group Chat"
 msgstr "新群聊"
 
-#: ../src/gui_menu_builder.py:413
+#: ../src/gui_menu_builder.py:409
 msgid "I would like to add you to my roster"
 msgstr "我想加您为好友"
 
-#: ../src/history_manager.py:121
+#: ../src/history_manager.py:114
 msgid "Cannot find history logs database"
 msgstr "无法找到历史记录数据库"
 
 #. holds jid
-#: ../src/history_manager.py:161
+#: ../src/history_manager.py:154
 msgid "Contacts"
 msgstr "联系人"
 
 #. holds time
-#: ../src/history_manager.py:174 ../src/history_manager.py:214
-#: ../src/history_window.py:97
+#: ../src/history_manager.py:167 ../src/history_manager.py:207
+#: ../src/history_window.py:98
 msgid "Date"
 msgstr "日期"
 
 #. holds nickname
-#: ../src/history_manager.py:180 ../src/history_manager.py:232
+#: ../src/history_manager.py:173 ../src/history_manager.py:225
 msgid "Nickname"
 msgstr "昵称"
 
 #. holds message
-#: ../src/history_manager.py:188 ../src/history_manager.py:220
-#: ../src/history_window.py:105
+#: ../src/history_manager.py:181 ../src/history_manager.py:213
+#: ../src/history_window.py:106
 msgid "Message"
 msgstr "消息"
 
-#: ../src/history_manager.py:248
+#: ../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:250
+#: ../src/history_manager.py:243
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -9073,25 +9103,25 @@ msgstr ""
 "\n"
 "如果您点击“是”，请等待..."
 
-#: ../src/history_manager.py:467
+#: ../src/history_manager.py:460
 msgid "Exporting History Logs..."
 msgstr "输出历史记录..."
 
-#: ../src/history_manager.py:542
+#: ../src/history_manager.py:535
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s 在 %(time)s 时说： %(message)s\n"
 
-#: ../src/history_manager.py:579
+#: ../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:583 ../src/history_manager.py:618
+#: ../src/history_manager.py:576 ../src/history_manager.py:611
 msgid "This is an irreversible operation."
 msgstr "该操作是不可撤消的。"
 
-#: ../src/history_manager.py:615
+#: ../src/history_manager.py:608
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "您确定要删除所选定的消息？"
@@ -9129,38 +9159,38 @@ msgstr "现在状态：%(status)s：%(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "现在状态： %(status)s "
 
-#: ../src/htmltextview.py:513 ../src/htmltextview.py:523
+#: ../src/htmltextview.py:515 ../src/htmltextview.py:525
 #, fuzzy
 msgid "Timeout loading image"
 msgstr "无法读取图片"
 
-#: ../src/htmltextview.py:533
+#: ../src/htmltextview.py:535
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/message_window.py:225
+#: ../src/message_window.py:220
 #, fuzzy
 msgid "You are going to close several tabs"
 msgstr "尚未连接到服务器"
 
-#: ../src/message_window.py:226
+#: ../src/message_window.py:221
 #, fuzzy
 msgid "Do you really want to close them all?"
 msgstr "您确定要删除所选定的消息？"
 
-#: ../src/message_window.py:490
+#: ../src/message_window.py:482
 msgid "Chats"
 msgstr "聊天"
 
-#: ../src/message_window.py:492
+#: ../src/message_window.py:484
 msgid "Group Chats"
 msgstr "群聊"
 
-#: ../src/message_window.py:494
+#: ../src/message_window.py:486
 msgid "Private Chats"
 msgstr "私聊"
 
-#: ../src/message_window.py:500
+#: ../src/message_window.py:492
 msgid "Messages"
 msgstr "消息"
 
@@ -9172,22 +9202,22 @@ msgstr ""
 msgid "- messages will not be logged"
 msgstr ""
 
-#: ../src/notify.py:248
+#: ../src/notify.py:250
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s 状态改变"
 
-#: ../src/notify.py:258
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s 上线了"
 
-#: ../src/notify.py:266
+#: ../src/notify.py:268
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s 离开了"
 
-#: ../src/notify.py:278
+#: ../src/notify.py:279
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr " %(nickname)s 发来的新消息"
@@ -9212,7 +9242,7 @@ msgstr "来自 %(nickname)s 的新消息"
 msgid "New Message from %(nickname)s"
 msgstr "来自 %(nickname)s 的新消息"
 
-#: ../src/notify.py:568
+#: ../src/notify.py:566
 #, fuzzy
 msgid "Ignore"
 msgstr "九"
@@ -9221,12 +9251,12 @@ msgstr "九"
 msgid "Retrieving profile..."
 msgstr "取回概况..."
 
-#: ../src/profile_window.py:110 ../src/roster_window.py:2845
+#: ../src/profile_window.py:110 ../src/roster_window.py:2932
 #, fuzzy
 msgid "File is empty"
 msgstr "文件路径"
 
-#: ../src/profile_window.py:113 ../src/roster_window.py:2848
+#: ../src/profile_window.py:113 ../src/roster_window.py:2935
 #, fuzzy
 msgid "File does not exist"
 msgstr "不存在这样的群聊"
@@ -9234,7 +9264,7 @@ msgstr "不存在这样的群聊"
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:127 ../src/profile_window.py:143
-#: ../src/roster_window.py:2850 ../src/roster_window.py:2861
+#: ../src/roster_window.py:2937 ../src/roster_window.py:2948
 msgid "Could not load image"
 msgstr "无法读取图片"
 
@@ -9264,201 +9294,212 @@ msgid ""
 "later."
 msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
-#: ../src/roster_window.py:280 ../src/roster_window.py:1019
+#: ../src/roster_window.py:283 ../src/roster_window.py:1028
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:1871
+#: ../src/roster_window.py:1916
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1872
+#: ../src/roster_window.py:1917
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:1894
+#: ../src/roster_window.py:1940
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1941
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1955
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1910
+#: ../src/roster_window.py:1956
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1938
+#: ../src/roster_window.py:1983
 msgid "GPG is not usable"
 msgstr ""
 
-#: ../src/roster_window.py:1939
+#: ../src/roster_window.py:1984
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
-#: ../src/roster_window.py:2148 ../src/roster_window.py:3394
+#: ../src/roster_window.py:2196 ../src/roster_window.py:3493
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:2149 ../src/roster_window.py:3395
+#: ../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?"
 msgstr "隐身将从所有群聊中断开。确定隐身？"
 
-#: ../src/roster_window.py:2175
+#: ../src/roster_window.py:2223
 msgid "desync'ed"
 msgstr ""
 
-#: ../src/roster_window.py:2236
+#: ../src/roster_window.py:2285
 msgid "Really quit Gajim?"
 msgstr ""
 
-#: ../src/roster_window.py:2237
+#: ../src/roster_window.py:2286
 #, fuzzy
 msgid "Are you sure you want to quit Gajim?"
 msgstr "确定要离开房间“ %s ”？"
 
-#: ../src/roster_window.py:2238
+#: ../src/roster_window.py:2287
 msgid "Always close Gajim"
 msgstr ""
 
-#: ../src/roster_window.py:2333 ../src/roster_window.py:2576
+#: ../src/roster_window.py:2370
+#, fuzzy
+msgid "You have running file transfers"
+msgstr "取消文件传输"
+
+#: ../src/roster_window.py:2371
+msgid ""
+"If you quit now, the file(s) being transfered will be stopped. Do you still "
+"want to quit?"
+msgstr ""
+
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2650
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:2334
+#: ../src/roster_window.py:2403
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled and contact is in your roster."
 msgstr "启用历史后才能再次重读消息"
 
-#: ../src/roster_window.py:2577
+#: ../src/roster_window.py:2651
 msgid "You must read them before removing this transport."
 msgstr "移除代理前请阅读所有未决事件。"
 
-#: ../src/roster_window.py:2580
+#: ../src/roster_window.py:2654
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:2581
+#: ../src/roster_window.py:2655
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
 "this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:2584
+#: ../src/roster_window.py:2658
 msgid "Transports will be removed"
 msgstr "代理将被移除"
 
-#: ../src/roster_window.py:2589
+#: ../src/roster_window.py:2663
 #, 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:2653
+#: ../src/roster_window.py:2731
 #, fuzzy
 msgid "You are about to block a contact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:2655
+#: ../src/roster_window.py:2733
 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:2741
+#: ../src/roster_window.py:2824
 msgid "Rename Contact"
 msgstr "重命名联系人"
 
-#: ../src/roster_window.py:2742
+#: ../src/roster_window.py:2825
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "为联系人 %s 输入新的昵称"
 
-#: ../src/roster_window.py:2749
+#: ../src/roster_window.py:2832
 msgid "Rename Group"
 msgstr "重命名群组"
 
-#: ../src/roster_window.py:2750
+#: ../src/roster_window.py:2833
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "为群组 %s 输入新的名称"
 
-#: ../src/roster_window.py:2791
+#: ../src/roster_window.py:2878
 msgid "Remove Group"
 msgstr "移除群组"
 
-#: ../src/roster_window.py:2792
+#: ../src/roster_window.py:2879
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "您想从名单中删除组 %s ?"
 
-#: ../src/roster_window.py:2793
+#: ../src/roster_window.py:2880
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "同时从名单移除这个群组的所有联系人"
 
-#: ../src/roster_window.py:2832
+#: ../src/roster_window.py:2919
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:2833
+#: ../src/roster_window.py:2920
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:3210
+#: ../src/roster_window.py:3303
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:3212
+#: ../src/roster_window.py:3305
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 
-#: ../src/roster_window.py:3217
+#: ../src/roster_window.py:3310
 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:3223
+#: ../src/roster_window.py:3316
 #, fuzzy
 msgid "Do you want to continue?"
 msgstr "想做什么？"
 
-#: ../src/roster_window.py:3226
+#: ../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."
 msgstr "移除此联系人的同时将默认移除认证，导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:3229
+#: ../src/roster_window.py:3323
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3233
+#: ../src/roster_window.py:3327
 msgid "Contacts will be removed from your roster"
 msgstr "联系人将从您的名单中移除"
 
-#: ../src/roster_window.py:3238
+#: ../src/roster_window.py:3332
 #, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9467,32 +9508,32 @@ msgstr ""
 "移除这些联系人：%s 的同时\n"
 "将移除认证导致他们将一直看到您为离线。"
 
-#: ../src/roster_window.py:3295
+#: ../src/roster_window.py:3390
 #, 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:3297
+#: ../src/roster_window.py:3392
 #, python-format
 msgid ""
 "This contact will temporarily see you as %(status)s, but only until you "
-"change your status. Then he will see your global status."
+"change your status. Then he or she will see your global status."
 msgstr ""
 
-#: ../src/roster_window.py:3316
+#: ../src/roster_window.py:3411
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:3317
+#: ../src/roster_window.py:3412
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:3897
+#: ../src/roster_window.py:4020
 msgid "Metacontacts storage not supported by your server"
 msgstr "您的服务器不支持元联系人存储"
 
-#: ../src/roster_window.py:3899
+#: ../src/roster_window.py:4022
 #, fuzzy
 msgid ""
 "Your server does not support storing metacontacts information. So those "
@@ -9500,12 +9541,12 @@ msgid ""
 msgstr ""
 "您的服务器不支持存储元联系人信息。所以这些信息在下次重新连接时将不被保存。"
 
-#: ../src/roster_window.py:3984
+#: ../src/roster_window.py:4114
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr "您在创建一个元联系人。确定继续？"
 
-#: ../src/roster_window.py:3986
+#: ../src/roster_window.py:4116
 #, fuzzy
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
@@ -9515,23 +9556,23 @@ msgstr ""
 "元联系人是一种分组若干联系人的方法。一般而言这用在当一个人有若干 Jabber 账户"
 "或代理账户时。"
 
-#: ../src/roster_window.py:4101
+#: ../src/roster_window.py:4231
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "无效文件"
 
-#: ../src/roster_window.py:4112
+#: ../src/roster_window.py:4243
 #, fuzzy, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "%s 想发送给您一个文件："
 
-#: ../src/roster_window.py:4227
+#: ../src/roster_window.py:4358
 #, fuzzy, python-format
 msgid "Send %s to %s"
 msgstr "发送 %s"
 
-#: ../src/roster_window.py:4233
+#: ../src/roster_window.py:4364
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "创建 %s 和 %s 元联系人"
@@ -9541,134 +9582,138 @@ msgstr "创建 %s 和 %s 元联系人"
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4718 ../src/roster_window.py:4789
-#: ../src/roster_window.py:4798 ../src/statusicon.py:248
-#: ../src/statusicon.py:295 ../src/statusicon.py:301
+#: ../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
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
 #. add
-#: ../src/roster_window.py:4805
+#: ../src/roster_window.py:4902
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
 #. disco
-#: ../src/roster_window.py:4810
+#: ../src/roster_window.py:4907
 #, python-format
 msgid "using %s account"
 msgstr "使用账户 %s"
 
-#: ../src/roster_window.py:4847 ../src/statusicon.py:311
+#: ../src/roster_window.py:4945 ../src/statusicon.py:309
 msgid "_Manage Bookmarks..."
 msgstr "书签管理(_M)..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4867
+#: ../src/roster_window.py:4965
 #, python-format
 msgid "of account %s"
 msgstr "帐户 %s 的"
 
-#: ../src/roster_window.py:4907
+#: ../src/roster_window.py:5006
 #, python-format
 msgid "for account %s"
 msgstr "为帐户 %s"
 
-#: ../src/roster_window.py:4963 ../src/roster_window.py:5064
+#: ../src/roster_window.py:5066 ../src/roster_window.py:5171
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:4990
+#: ../src/roster_window.py:5099
 #, fuzzy
 msgid "Publish Tune"
 msgstr "发布(_P)"
 
-#: ../src/roster_window.py:4998
+#: ../src/roster_window.py:5101
+#, fuzzy
+msgid "Publish Location"
+msgstr "发布(_P)"
+
+#: ../src/roster_window.py:5104
 #, fuzzy
 msgid "Configure Services..."
 msgstr "发掘服务(_D)..."
 
-#: ../src/roster_window.py:5145
+#: ../src/roster_window.py:5249
 msgid "_Maximize All"
 msgstr ""
 
-#. Send Group Message
-#: ../src/roster_window.py:5153 ../src/roster_window.py:5325
+#: ../src/roster_window.py:5259 ../src/roster_window.py:5433
 msgid "Send Group M_essage"
 msgstr "发送群组消息(_E)"
 
-#: ../src/roster_window.py:5161
+#: ../src/roster_window.py:5267
 msgid "To all users"
 msgstr "向所有的用户"
 
-#: ../src/roster_window.py:5165
+#: ../src/roster_window.py:5271
 msgid "To all online users"
 msgstr "向所有在线用户"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5345
+#: ../src/roster_window.py:5453
 #, fuzzy
 msgid "_Manage Contacts"
 msgstr "重命名联系人"
 
 #. Edit Groups
-#: ../src/roster_window.py:5353
+#: ../src/roster_window.py:5462
 msgid "Edit _Groups"
 msgstr "编辑群组"
 
 #. Send single message
-#: ../src/roster_window.py:5408
+#: ../src/roster_window.py:5517
 #, fuzzy
 msgid "Send Single Message"
 msgstr "发送单条消息(_S)"
 
 #. Execute Command
-#: ../src/roster_window.py:5454
+#: ../src/roster_window.py:5564
 msgid "Execute Command..."
 msgstr "运行命令..."
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5464
+#: ../src/roster_window.py:5574
 #, fuzzy
 msgid "_Manage Transport"
 msgstr "代理"
 
 #. Modify Transport
-#: ../src/roster_window.py:5472
+#: ../src/roster_window.py:5583
 #, fuzzy
 msgid "_Modify Transport"
 msgstr "显示代理(_P)"
 
 #. Rename
-#: ../src/roster_window.py:5481
+#: ../src/roster_window.py:5593
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../src/roster_window.py:5546
+#: ../src/roster_window.py:5653
 msgid "_Maximize"
 msgstr ""
 
-#: ../src/roster_window.py:5554
+#: ../src/roster_window.py:5662
 #, fuzzy
 msgid "_Reconnect"
 msgstr "联系人已断开连接"
 
-#: ../src/roster_window.py:5560
+#: ../src/roster_window.py:5669
 #, fuzzy
 msgid "_Disconnect"
 msgstr "联系人已断开连接"
 
 #. History manager
-#: ../src/roster_window.py:5642
+#: ../src/roster_window.py:5751
 msgid "History Manager"
 msgstr "历史管理器"
 
-#: ../src/roster_window.py:5653
+#: ../src/roster_window.py:5762
 msgid "_Join New Group Chat"
 msgstr "加入新群聊(_J)"
 
-#: ../src/roster_window.py:5809
+#: ../src/roster_window.py:5934
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
@@ -9703,9 +9748,9 @@ msgstr ""
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
 "\n"
-"\t%s\n"
+"%s\n"
 "\n"
-"\tAre these options acceptable?"
+"Are these options acceptable?"
 msgstr ""
 
 #: ../src/session.py:465
@@ -9718,119 +9763,129 @@ msgid ""
 "Continue with the session?"
 msgstr ""
 
-#: ../src/statusicon.py:209
+#: ../src/statusicon.py:210
 msgid "_Change Status Message..."
 msgstr "更改状态消息_(C)..."
 
-#: ../src/statusicon.py:325
+#: ../src/statusicon.py:322
+#, fuzzy
+msgid "Hide _Roster"
+msgstr "不在名单中"
+
+#: ../src/statusicon.py:333
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: ../src/tooltips.py:347 ../src/tooltips.py:544
+#: ../src/tooltips.py:351 ../src/tooltips.py:562
 msgid "Jabber ID: "
 msgstr "Jabber ID："
 
-#: ../src/tooltips.py:350 ../src/tooltips.py:548
+#: ../src/tooltips.py:354 ../src/tooltips.py:566
 msgid "Resource: "
 msgstr "资源："
 
-#: ../src/tooltips.py:355
+#: ../src/tooltips.py:359
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "此群聊的 %(owner_or_admin_or_member)s"
 
-#: ../src/tooltips.py:455
+#: ../src/tooltips.py:459
 msgid " [blocked]"
 msgstr ""
 
-#: ../src/tooltips.py:459
+#: ../src/tooltips.py:463
 msgid " [minimized]"
 msgstr ""
 
-#: ../src/tooltips.py:474 ../src/tooltips.py:686
+#: ../src/tooltips.py:478 ../src/tooltips.py:735
 msgid "Status: "
 msgstr "状态"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:522
 #, python-format
 msgid "Last status: %s"
 msgstr "最后状态：%s"
 
-#: ../src/tooltips.py:506
+#: ../src/tooltips.py:524 ../src/tooltips.py:587
 #, python-format
 msgid " since %s"
 msgstr "自从 %s"
 
-#: ../src/tooltips.py:524
+#: ../src/tooltips.py:542
 #, fuzzy
 msgid "Connected"
 msgstr "连接"
 
-#: ../src/tooltips.py:526
+#: ../src/tooltips.py:544
 #, fuzzy
 msgid "Disconnected"
 msgstr "联系人已断开连接"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:555
+#: ../src/tooltips.py:573
 msgid "Subscription: "
 msgstr "认证："
 
-#: ../src/tooltips.py:565
+#: ../src/tooltips.py:583
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:618
+#: ../src/tooltips.py:662
 #, fuzzy
 msgid "Tune:"
 msgstr "类型："
 
-#: ../src/tooltips.py:644
+#: ../src/tooltips.py:667
+#, fuzzy
+msgid "Location:"
+msgstr "帐户修改"
+
+#: ../src/tooltips.py:693
 msgid "Download"
 msgstr "下载"
 
-#: ../src/tooltips.py:650
+#: ../src/tooltips.py:699
 msgid "Upload"
 msgstr "上传"
 
-#: ../src/tooltips.py:657
+#: ../src/tooltips.py:706
 msgid "Type: "
 msgstr "类型"
 
-#: ../src/tooltips.py:661
+#: ../src/tooltips.py:710
 msgid "Transferred: "
 msgstr "已传输："
 
-#: ../src/tooltips.py:664 ../src/tooltips.py:685
+#: ../src/tooltips.py:713 ../src/tooltips.py:734
 msgid "Not started"
 msgstr "未开始"
 
-#: ../src/tooltips.py:668
+#: ../src/tooltips.py:717
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:670 ../src/tooltips.py:673
+#: ../src/tooltips.py:719 ../src/tooltips.py:722
 msgid "Completed"
 msgstr "已完成"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:726
 msgid "?transfer status:Paused"
 msgstr "?transfer status:暂停"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:730
 msgid "Stalled"
 msgstr "已冻结"
 
-#: ../src/tooltips.py:683
+#: ../src/tooltips.py:732
 msgid "Transferring"
 msgstr "传输中"
 
-#: ../src/tooltips.py:721
+#: ../src/tooltips.py:770
 msgid "This service has not yet responded with detailed information"
 msgstr "服务无详细信息应答"
 
-#: ../src/tooltips.py:724
+#: ../src/tooltips.py:773
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9838,64 +9893,369 @@ msgstr ""
 "此服务无法返回详细信息。\n"
 "它可能是继承或损坏的"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:251
 msgid "?Client:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:254
+#: ../src/vcard.py:253
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:275
+#: ../src/vcard.py:274
 #, fuzzy
 msgid "?Time:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:299 ../src/vcard.py:309 ../src/vcard.py:518
+#: ../src/vcard.py:298 ../src/vcard.py:308 ../src/vcard.py:516
 #, python-format
 msgid "since %s"
 msgstr "自 %s"
 
-#: ../src/vcard.py:336
+#: ../src/vcard.py:335
 #, fuzzy
 msgid "<b>Affiliation:</b>"
 msgstr "<b>应用</b>"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:348
+#: ../src/vcard.py:347
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:350
+#: ../src/vcard.py:349
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:357
+#: ../src/vcard.py:356
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:359
+#: ../src/vcard.py:358
 msgid "There is no pending subscription request."
 msgstr ""
 
-#: ../src/vcard.py:364 ../src/vcard.py:418 ../src/vcard.py:541
+#: ../src/vcard.py:363 ../src/vcard.py:417 ../src/vcard.py:539
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
+#, fuzzy
+#~ msgid "Join _Group Chat..."
+#~ msgstr "加入群聊(_G)"
+
+#~ msgid "_Add Contact..."
+#~ msgstr "添加联系人(_A)..."
+
+#~ msgid "_Discover Services"
+#~ msgstr "发掘服务(_D)"
+
+#~ msgid "_Execute Command..."
+#~ msgstr "执行命令(_E)..."
+
+#, fuzzy
+#~ msgid "_Modify Account"
+#~ msgstr "修改帐户"
+
+#, fuzzy
+#~ msgid "_Personal Events"
+#~ msgstr "个人信息"
+
+#, fuzzy
+#~ msgid "_Start Chat..."
+#~ msgstr "开始聊天(_S)"
+
+#~ msgid "_Status"
+#~ msgstr "状态(_S)"
+
+#~ msgid "Account Modification"
+#~ msgstr "帐户修改"
+
+#~ msgid ""
+#~ "Check this so Gajim will connect in port 5223 where legacy servers are "
+#~ "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+#~ "default if broadcasted by the server, and with this option enabled TLS "
+#~ "will be disabled"
+#~ msgstr ""
+#~ "检查这里， Gajim 将连接代理服务器具有 SSL 能力的 5523 端口。注意， Gajim "
+#~ "使用 TLS 加密接受服务器广播，而使用该选项将禁用 TLS"
+
+#~ msgid "Edit Personal Information..."
+#~ msgstr "编辑个人信息..."
+
+#~ msgid "Hostname: "
+#~ msgstr "主机名："
+
+#~ msgid ""
+#~ "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+#~ "permission only for you"
+#~ msgstr ""
+#~ "如果选定，Gajim 会以已读许可方式为您个人把密码保存在 ~/.gajim/config 文件"
+#~ "中"
+
+#~ msgid "Port: "
+#~ msgstr "端口："
+
+#~ msgid "Proxy:"
+#~ msgstr "代理服务器："
+
+#~ msgid "Save _passphrase (insecure)"
+#~ msgstr "保存密文(_P)(不安全)"
+
+#~ msgid "Send keep-alive packets"
+#~ msgstr "发送防超时数据包"
+
+#~ msgid "Use _SSL (legacy)"
+#~ msgstr "使用 SSL(_S) (优先)"
+
+#~ msgid "_Adjust to status"
+#~ msgstr "调整状态(_A)"
+
+#~ msgid "Delete MOTD"
+#~ msgstr "删除 MOTD"
+
+#, fuzzy
+#~ msgid "_Send Server Message..."
+#~ msgstr "发送服务器消息(_S)"
+
+#, fuzzy
+#~ msgid ""
+#~ "Receive a Message\n"
+#~ "Contact Disconnected \n"
+#~ "Contact Change Status \n"
+#~ "Group Chat Message Highlight \n"
+#~ "Group Chat Message Received \n"
+#~ "File Transfer Request \n"
+#~ "File Transfer Started \n"
+#~ "File Transfer Finished"
+#~ msgstr ""
+#~ "接受消息\n"
+#~ "联系人在线\n"
+#~ "联系人离线\n"
+#~ "联系人改变状态\n"
+#~ "群聊消息高亮\n"
+#~ "接收到群聊消息\n"
+#~ "文件传输请求\n"
+#~ "文件传输开始\n"
+#~ "文件传输结束"
+
+#~ msgid ""
+#~ "contact(s)\n"
+#~ "group(s)\n"
+#~ "everybody"
+#~ msgstr ""
+#~ "联系人\n"
+#~ "组\n"
+#~ "任何人"
+
+#~ msgid "Join _Group Chat"
+#~ msgstr "加入群聊(_G)"
+
+#~ msgid "_Copy JID/Email Address"
+#~ msgstr "复制 JID/电子邮件地址(_C)"
+
+#~ msgid "_Copy Link Location"
+#~ msgstr "复制连接位置(_C)"
+
+#~ msgid "_Open Email Composer"
+#~ msgstr "打开邮件编辑器(_O)"
+
+#~ msgid "_Open Link in Browser"
+#~ msgstr "在浏览器中打开连接(_O)"
+
+#~ msgid "_Start Chat"
+#~ msgstr "开始聊天(_S)"
+
+#~ msgid ""
+#~ "Account row\n"
+#~ "Group row\n"
+#~ "Contact row\n"
+#~ "Chat Banner"
+#~ msgstr ""
+#~ "账户栏\n"
+#~ "组栏\n"
+#~ "联系人栏\n"
+#~ "聊天条"
+
+#, fuzzy
+#~ msgid "Change _Nickname..."
+#~ msgstr "更换昵称(_N)"
+
+#, fuzzy
+#~ msgid "Change _Subject..."
+#~ msgstr "更换主题(_S)"
+
+#, fuzzy
+#~ msgid "Configure _Room..."
+#~ msgstr "设置房间(_R)"
+
+#, fuzzy
+#~ msgid "_Manage Room"
+#~ msgstr "书签管理"
+
+#~ msgid "Send _File"
+#~ msgstr "发送文件(_F)"
+
+#~ msgid "_Add to Roster"
+#~ msgstr "添加至名单(_A)"
+
+#~ msgid "_Send Private Message"
+#~ msgstr "发送私聊消息(_S)"
+
+#~ msgid "Manage Accounts"
+#~ msgstr "帐户管理"
+
+#, fuzzy
+#~ msgid "gtk-delete"
+#~ msgstr "删除"
+
+#, fuzzy
+#~ msgid "Add this contact to roster (Ctrl+D)"
+#~ msgstr "向名单添加联系人"
+
+#, fuzzy
+#~ msgid "Bookmark this room (Ctrl+B)"
+#~ msgstr "将本房间加入书签(_B)"
+
+#, fuzzy
+#~ msgid "Change your nickname (Ctrl+N)"
+#~ msgstr "更换昵称(_N)"
+
+#, fuzzy
+#~ msgid "Invite contacts to the conversation (Ctrl+G)"
+#~ msgstr "正在专注于聊天"
+
+#, fuzzy
+#~ msgid "Show a list of emoticons (Alt+M)"
+#~ msgstr "点这里插入表情符 (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a list of formattings"
+#~ msgstr "点这里插入表情符 (Alt+M)"
+
+#, fuzzy
+#~ msgid "Show a menu of advanced functions (Alt+D)"
+#~ msgstr "点这里插入表情符 (Alt+M)"
+
+#~ msgid ""
+#~ "All chat states\n"
+#~ "Composing only\n"
+#~ "Disabled"
+#~ msgstr ""
+#~ "所有聊天状态\n"
+#~ "仅在书写\n"
+#~ "禁用"
+
+#, fuzzy
+#~ msgid ""
+#~ "Autodetect on every Gajim startup\n"
+#~ "Always use GNOME default applications\n"
+#~ "Always use KDE default applications\n"
+#~ "Always use Xfce default applications\n"
+#~ "Custom"
+#~ msgstr ""
+#~ "每次 Gajim 启动时自动探测\n"
+#~ "总是使用 GNOME 默认应用\n"
+#~ "总是使用 KDE 默认应用\n"
+#~ "总是使用 Xfce 默认应用\n"
+#~ "自定义"
+
+#~ msgid ""
+#~ "none\n"
+#~ "both\n"
+#~ "from\n"
+#~ "to"
+#~ msgstr ""
+#~ "无\n"
+#~ "双向\n"
+#~ "从\n"
+#~ "到"
+
+#, fuzzy
+#~ msgid "gtk-cancel"
+#~ msgstr "删除"
+
+#, fuzzy
+#~ msgid "Add _Contact..."
+#~ msgstr "添加联系人(_A)..."
+
+#, fuzzy
+#~ msgid "Fea_tures"
+#~ msgstr "服务器设定"
+
+#~ msgid "File _Transfers"
+#~ msgstr "文件传输(_T)"
+
+#~ msgid "Profile, A_vatar"
+#~ msgstr "模板，明细(V)"
+
+#, fuzzy
+#~ msgid "_Accounts"
+#~ msgstr "帐户"
+
+#~ msgid "_Contents"
+#~ msgstr "内容(_C)"
+
+#~ msgid "_FAQ"
+#~ msgstr "常见问题(_A)"
+
+#~ msgid "_Preferences"
+#~ msgstr "首选项(_P)"
+
+#~ msgid "_Quit"
+#~ msgstr "退出(_Q)"
+
+#, fuzzy
+#~ msgid "_Send Single Message..."
+#~ msgstr "发送一条消息...(_M)"
+
+#~ msgid "Send Single _Message"
+#~ msgstr "发送单条消息(_M)"
+
+#~ msgid "Sta_tus"
+#~ msgstr "状态(_T)"
+
+#~ msgid "_Group Chat"
+#~ msgstr "群聊(_G)"
+
+#~ msgid "Enable"
+#~ msgstr "启用"
+
+#~ msgid "_Modify Account..."
+#~ msgstr "修改帐户(_M)..."
+
+#~ msgid "Wrong host"
+#~ msgstr "错误主机"
+
+#~ msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+#~ msgstr "pysqlite2 (aka python-pysqlite2) 匹配缺失。正在退出..."
+
+#~ msgid "GTK+ runtime is missing libglade support"
+#~ msgstr "GTK+ 运行时环境缺少 libglade 支持"
+
+#~ msgid ""
+#~ "Please remove your current GTK+ runtime and install the latest stable "
+#~ "version from %s"
+#~ msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
+
+#~ msgid ""
+#~ "Please make sure that GTK+ and PyGTK have libglade support in your system."
+#~ msgstr "请确认您系统中 gtk+ 及 pygtk 对 libglade 的支持。"
+
+#~ msgid "Gajim needs PySQLite2 to run"
+#~ msgstr "运行 Gajim 需要 PySQLite2 "
+
 #~ msgid "_Incoming message:"
 #~ msgstr "抵达的消息：(_I)"
 
@@ -10075,10 +10435,6 @@ msgstr "带有优先级的资源"
 #~ msgid "Gajim account %s"
 #~ msgstr "Gajim 帐户 %s"
 
-#, fuzzy
-#~ msgid "Custom"
-#~ msgstr "<b>自定义</b>"
-
 #~ msgid "Duplicate Jabber ID"
 #~ msgstr "复制 Jabber ID"
 
@@ -10245,9 +10601,6 @@ msgstr "带有优先级的资源"
 #~ msgid "Set status message to reflect currently playing _music track"
 #~ msgstr "设置状态消息为当前播放的音轨(_M)"
 
-#~ msgid "Show only in _roster"
-#~ msgstr "只显示名单中(_R)"
-
 #~ msgid "The auto away status message"
 #~ msgstr "自动离开状态消息"
 
@@ -10282,18 +10635,9 @@ msgstr "带有优先级的资源"
 #~ msgid "_Before time:"
 #~ msgstr "在该时间前：(_B)"
 
-#~ msgid "_Never"
-#~ msgstr "从不(_N)"
-
-#~ msgid "_Notify me about it"
-#~ msgstr "提醒我(_N)"
-
 #~ msgid "_Player:"
 #~ msgstr "参与者(_P)"
 
-#~ msgid "_Pop it up"
-#~ msgstr "弹出(_P)"
-
 #~ msgid "Address"
 #~ msgstr "地址"
 
@@ -10574,9 +10918,6 @@ msgstr "带有优先级的资源"
 #~ msgid "Size: "
 #~ msgstr "大小："
 
-#~ msgid "Session bus is not available"
-#~ msgstr "会话总线不可用"
-
 #~ msgid "Sound"
 #~ msgstr "声音"